From cce53b3d88272d9d79996b2ea6174e56e3f276c6 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Wed, 15 Jul 2020 13:38:15 -0700
Subject: [PATCH 001/213] adding files need to update auth

---
 Scripts/getLatestVersion.ps1                  |   6 +-
 Scripts/validateMavenVersion.ps1              |   7 +-
 build.gradle                                  |   2 +
 .../graph/authentication/AuthConstants.java   |  14 ++
 .../IAuthenticationProvider.java              |  15 ++
 .../TokenCredntialAuthProvider.java           |  41 ++++++
 .../microsoft/graph/httpcore/HttpMethod.java  |  28 ++++
 .../graph/httpcore/IHttpRequest.java          | 135 ++++++++++++++++++
 .../microsoft/graph/options/HeaderOption.java |  17 +++
 .../com/microsoft/graph/options/Option.java   |  46 ++++++
 10 files changed, 305 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/authentication/AuthConstants.java
 create mode 100644 src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
 create mode 100644 src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java
 create mode 100644 src/main/java/com/microsoft/graph/httpcore/HttpMethod.java
 create mode 100644 src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/options/HeaderOption.java
 create mode 100644 src/main/java/com/microsoft/graph/options/Option.java

diff --git a/Scripts/getLatestVersion.ps1 b/Scripts/getLatestVersion.ps1
index ca1806b62..bcf3475ec 100644
--- a/Scripts/getLatestVersion.ps1
+++ b/Scripts/getLatestVersion.ps1
@@ -6,10 +6,10 @@
     Retrieve the latest version of the library
 .Description 
     Retrieves the latest version specified in the Gradle.Properties file
-    Uses the retrieved values to update the enviornment variable VERSION_STRING
-#>
-
+    Uses the retrieved values to update the environment variable VERSION_STRING
 .Parameter propertiesPath
+    The path pointing to the gradle.properties file.
+#>
 
 Param(
     [parameter(Mandatory = $true)]
diff --git a/Scripts/validateMavenVersion.ps1 b/Scripts/validateMavenVersion.ps1
index f591d5e1e..bd3dd66c7 100644
--- a/Scripts/validateMavenVersion.ps1
+++ b/Scripts/validateMavenVersion.ps1
@@ -8,11 +8,12 @@
 .Description 
     Retrieves the local, Maven, and Bintray versions of the Java-Core build.
     Checks that the Maven and Bintray versions are aligned, trigger warning if not.
-    Checks that the current local version is greater than those currently deployed. 
-#>
-
+    Checks that the current local version is greater than those currently deployed.
 .Parameter packageName
+    The package name to search in the Maven and JCenter repositories.
 .Parameter propertiesPath
+    The path pointing to the Gradle.Properties file.
+#>
 
 Param(
     [parameter(Mandatory = $true)]
diff --git a/build.gradle b/build.gradle
index 261f884bc..ee44ab9bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,8 @@ dependencies {
     
     // https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple
 	compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1'
+
+    implementation 'com.azure:azure-identity:1.0.8'
 }
 
 def pomConfig = {
diff --git a/src/main/java/com/microsoft/graph/authentication/AuthConstants.java b/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
new file mode 100644
index 000000000..1a0233df3
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
@@ -0,0 +1,14 @@
+package com.microsoft.graph.authentication;
+
+public class AuthConstants {
+
+    public static class Tenants
+    {
+        public static final String Common = "common";
+        public static final String Organizations = "organizations";
+        public static final String Consumers = "consumers";
+    }
+    public static final String BEARER = "Bearer ";
+    public static final String TOKEN_ENDPOINT = "/oauth2/v2.0/token";
+    public static final String AUTHORIZATION_HEADER = "Authorization";
+}
\ No newline at end of file
diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
new file mode 100644
index 000000000..15ed5bd82
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -0,0 +1,15 @@
+package com.microsoft.graph.authentication;
+
+//This should be deleted later once IHttpRequest is moved to the core library
+import com.microsoft.graph.httpcore.IHttpRequest;
+
+public interface IAuthenticationProvider {
+
+    /**
+     * Authenticates the request
+     *
+     * @param request the request to authenticate
+     */
+    void authenticateRequest(final IHttpRequest request);
+
+}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java
new file mode 100644
index 000000000..c96b96477
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java
@@ -0,0 +1,41 @@
+package com.microsoft.graph.authentication;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.credential.TokenRequestContext;
+import com.azure.core.http.HttpRequest;
+import com.microsoft.graph.httpcore.IHttpRequest;
+import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
+import okhttp3.Request;
+
+import java.util.List;
+
+public class TokenCredntialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
+
+    private TokenCredential tokenCredential;
+    private HttpRequest request;
+    private TokenRequestContext context;
+
+    public TokenCredntialAuthProvider(TokenCredential tokenCredential, List<String> scopes) {
+        this.tokenCredential = tokenCredential;
+        context = new TokenRequestContext().setScopes(scopes);
+    }
+
+    @Override
+    public void authenticateRequest(IHttpRequest request) {
+        String accessToken = tokenCredential.getToken(context).toString();
+        request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + accessToken);
+    }
+
+    @Override
+    public Request authenticateRequest(Request request) {
+        String accessToken = "";//getAccessToken();
+        return request.newBuilder()
+                .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + accessToken)
+                .build();
+    }
+
+//    void getAccessToken(String credential) {
+//        String accessToken = tokenCredential.getToken(context).toString();
+//
+//    }
+}
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpMethod.java b/src/main/java/com/microsoft/graph/httpcore/HttpMethod.java
new file mode 100644
index 000000000..878e487ac
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpMethod.java
@@ -0,0 +1,28 @@
+package com.microsoft.graph.httpcore;
+
+public enum HttpMethod {
+    /**
+     * Get
+     */
+    GET,
+
+    /**
+     * Post
+     */
+    POST,
+
+    /**
+     * Patch
+     */
+    PATCH,
+
+    /**
+     * Delete
+     */
+    DELETE,
+
+    /**
+     * Put
+     */
+    PUT,
+}
diff --git a/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java b/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
new file mode 100644
index 000000000..44c88134d
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
@@ -0,0 +1,135 @@
+package com.microsoft.graph.httpcore;
+
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
+
+import java.net.URL;
+import java.util.List;
+
+/**
+ * An HTTP request
+ */
+public interface IHttpRequest {
+
+    /**
+     * Gets the request URL
+     *
+     * @return the request URL
+     */
+    URL getRequestUrl();
+
+    /**
+     * Gets the HTTP method
+     *
+     * @return the HTTP method
+     */
+    HttpMethod getHttpMethod();
+
+    /**
+     * Gets the headers
+     *
+     * @return the headers
+     */
+    List<HeaderOption> getHeaders();
+
+    /**
+     * Gets the options
+     *
+     * @return the options
+     */
+    List<Option> getOptions();
+
+    /**
+     * Adds a header to this request
+     *
+     * @param header the name of the header
+     * @param value  the value of the header
+     */
+    void addHeader(String header, String value);
+
+    /**
+     * Sets useCaches parameter to cache the response
+     *
+     * @param useCaches the value of useCaches
+     */
+    void setUseCaches(boolean useCaches);
+
+    /**
+     * Gets useCaches parameter
+     *
+     * @return the value of useCaches
+     */
+    boolean getUseCaches();
+
+    /**
+     * Sets the max redirects
+     *
+     * @param maxRedirects Max redirects that a request can take
+     */
+    void setMaxRedirects(int maxRedirects);
+
+    /**
+     * Gets the max redirects
+     *
+     * @return Max redirects that a request can take
+     */
+    int getMaxRedirects();
+
+    /**
+     * Sets the should redirect callback
+     *
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    void setShouldRedirect(IShouldRedirect shouldRedirect);
+
+    /**
+     * Gets the should redirect callback
+     *
+     * @return Callback which is called before redirect
+     */
+    IShouldRedirect getShouldRedirect();
+
+    /**
+     * Sets the should retry callback
+     *
+     * @param shouldretry The callback called before retry
+     */
+    void setShouldRetry(IShouldRetry shouldretry);
+
+    /**
+     * Gets the should retry callback
+     *
+     * @return Callback called before retry
+     */
+    IShouldRetry getShouldRetry();
+
+    /**
+     * Sets the max retries
+     *
+     * @param maxRetries Max retries for a request
+     */
+    void setMaxRetries(int maxRetries);
+
+    /**
+     * Gets max retries
+     *
+     * @return Max retries for a request
+     */
+    int getMaxRetries();
+
+    /**
+     * Sets the delay in seconds between retires
+     *
+     * @param delay Delay in seconds between retries
+     */
+    void setDelay(long delay);
+
+    /**
+     * Gets delay between retries
+     *
+     * @return Delay between retries in seconds
+     */
+    long getDelay();
+}
\ No newline at end of file
diff --git a/src/main/java/com/microsoft/graph/options/HeaderOption.java b/src/main/java/com/microsoft/graph/options/HeaderOption.java
new file mode 100644
index 000000000..0abb8b878
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/options/HeaderOption.java
@@ -0,0 +1,17 @@
+package com.microsoft.graph.options;
+
+/**
+ * A header value
+ */
+public class HeaderOption extends Option {
+
+    /**
+     * Creates a header option object
+     *
+     * @param name  the name of the header
+     * @param value the value of the header
+     */
+    public HeaderOption(final  String name, final String value) {
+        super(name, value);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
new file mode 100644
index 000000000..36323852f
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/options/Option.java
@@ -0,0 +1,46 @@
+package com.microsoft.graph.options;
+
+/**
+ * An option that is settable for a request
+ */
+public class Option {
+
+    /**
+     * The name of the option
+     */
+    private final String name;
+
+    /**
+     * The value of the option
+     */
+    private final Object value;
+
+    /**
+     * Creates an option object
+     *
+     * @param name  the name of the option
+     * @param value the value of the option
+     */
+    protected Option(final String name, final Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * Gets the name of the option
+     *
+     * @return the name of the option
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the value of the option
+     *
+     * @return the value of the option
+     */
+    public Object getValue() {
+        return value;
+    }
+}
\ No newline at end of file

From ebf5129de9a33a74dd68322c1e71aa8deaf8f652 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Fri, 17 Jul 2020 16:05:37 -0700
Subject: [PATCH 002/213] basic logic for the authentication, saving before
 begining to move files

---
 .../IAuthenticationProvider.java              |  1 -
 .../TokenCredentialAuthProvider.java          | 52 +++++++++++++++++++
 .../TokenCredntialAuthProvider.java           | 41 ---------------
 3 files changed, 52 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
 delete mode 100644 src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java

diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index 15ed5bd82..08dfcb3e0 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -1,6 +1,5 @@
 package com.microsoft.graph.authentication;
 
-//This should be deleted later once IHttpRequest is moved to the core library
 import com.microsoft.graph.httpcore.IHttpRequest;
 
 public interface IAuthenticationProvider {
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
new file mode 100644
index 000000000..dbf09cf83
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -0,0 +1,52 @@
+package com.microsoft.graph.authentication;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.credential.TokenRequestContext;
+import com.azure.core.http.HttpRequest;
+import com.microsoft.graph.httpcore.IHttpRequest;
+import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
+import okhttp3.Request;
+
+import java.util.List;
+
+public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
+
+    private TokenCredential tokenCredential;
+    private TokenRequestContext context;
+    private AccessToken accessToken;
+
+    public  TokenCredentialAuthProvider(TokenCredential tokenCredential) {
+        this.tokenCredential = tokenCredential;
+        this.context = new TokenRequestContext();
+    }
+
+    public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String> scopes) {
+        this(tokenCredential);
+        this.context.setScopes(scopes);
+    }
+
+    @Override
+    public void authenticateRequest(IHttpRequest request) {
+        request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
+    }
+
+    @Override
+    public Request authenticateRequest(Request request) {
+        return request.newBuilder()
+                .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
+                .build();
+    }
+
+    String getAccessToken() {
+        this.tokenCredential.getToken(this.context).subscribe(token -> {
+            this.accessToken = token;
+        }, failToken ->{
+            //Do something if failure to receive the token
+            this.accessToken = null;
+        });
+        return this.accessToken.getToken();
+    }
+
+
+}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java
deleted file mode 100644
index c96b96477..000000000
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredntialAuthProvider.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.microsoft.graph.authentication;
-
-import com.azure.core.credential.TokenCredential;
-import com.azure.core.credential.TokenRequestContext;
-import com.azure.core.http.HttpRequest;
-import com.microsoft.graph.httpcore.IHttpRequest;
-import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
-import okhttp3.Request;
-
-import java.util.List;
-
-public class TokenCredntialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
-
-    private TokenCredential tokenCredential;
-    private HttpRequest request;
-    private TokenRequestContext context;
-
-    public TokenCredntialAuthProvider(TokenCredential tokenCredential, List<String> scopes) {
-        this.tokenCredential = tokenCredential;
-        context = new TokenRequestContext().setScopes(scopes);
-    }
-
-    @Override
-    public void authenticateRequest(IHttpRequest request) {
-        String accessToken = tokenCredential.getToken(context).toString();
-        request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + accessToken);
-    }
-
-    @Override
-    public Request authenticateRequest(Request request) {
-        String accessToken = "";//getAccessToken();
-        return request.newBuilder()
-                .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + accessToken)
-                .build();
-    }
-
-//    void getAccessToken(String credential) {
-//        String accessToken = tokenCredential.getToken(context).toString();
-//
-//    }
-}

From 2d047533067656c94307755a12fdb07017180c28 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Fri, 17 Jul 2020 16:18:43 -0700
Subject: [PATCH 003/213] move ICoreAuthenticationProvide class location,
 refactored class dependencies

---
 .../ICoreAuthenticationProvider.java                           | 2 +-
 .../graph/authentication/TokenCredentialAuthProvider.java      | 2 --
 .../com/microsoft/graph/httpcore/AuthenticationHandler.java    | 1 +
 src/main/java/com/microsoft/graph/httpcore/HttpClients.java    | 1 +
 .../microsoft/graph/httpcore/AuthenticationHandlerTest.java    | 3 ++-
 .../java/com/microsoft/graph/httpcore/HttpClientsTest.java     | 1 +
 .../com/microsoft/graph/httpcore/TelemetryHandlerTest.java     | 1 +
 7 files changed, 7 insertions(+), 4 deletions(-)
 rename src/main/java/com/microsoft/graph/{httpcore => authentication}/ICoreAuthenticationProvider.java (86%)

diff --git a/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
similarity index 86%
rename from src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
rename to src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
index 1ca39a432..69959aae8 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
@@ -1,4 +1,4 @@
-package com.microsoft.graph.httpcore;
+package com.microsoft.graph.authentication;
 
 import okhttp3.Request;
 
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index dbf09cf83..a1d3cbd68 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -3,9 +3,7 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
-import com.azure.core.http.HttpRequest;
 import com.microsoft.graph.httpcore.IHttpRequest;
-import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
 import okhttp3.Request;
 
 import java.util.List;
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index b48b8b337..0a82cbf93 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 
+import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index a85acc7de..a67ab0815 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.httpcore;
 
+import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.OkHttpClient.Builder;
diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index 7f5feba6f..8e583d12b 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -14,7 +15,7 @@ public class AuthenticationHandlerTest {
 	
 	static String token = "TEST-TOKEN";
 	
-	public static class AuthProvider implements ICoreAuthenticationProvider{
+	public static class AuthProvider implements ICoreAuthenticationProvider {
 		 public Request authenticateRequest(Request request) {
 			 Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + token).build();
 			 return newRequest;
diff --git a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
index 6043c432d..afc064a9e 100644
--- a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertTrue;
 
+import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
 import org.junit.Test;
 
 import okhttp3.Interceptor;
diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
index deab260a4..cdc9a7953 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
@@ -5,6 +5,7 @@
 
 import java.io.IOException;
 
+import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
 import org.junit.Ignore;
 import org.junit.Test;
 

From e48d463de7364cfcc6083f2a1e0b0333c8fe8cde Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Mon, 27 Jul 2020 11:57:38 -0700
Subject: [PATCH 004/213] updaed tokenCredAuthProvider

---
 build.gradle                                  |  4 ++--
 .../IAuthenticationProvider.java              |  1 +
 .../ICoreAuthenticationProvider.java          |  1 +
 .../TokenCredentialAuthProvider.java          | 17 +++++++++-----
 .../exceptions/AuthenticationException.java   | 22 +++++++++++++++++++
 .../com/microsoft/graph/exceptions/Error.java | 18 +++++++++++++++
 6 files changed, 55 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
 create mode 100644 src/main/java/com/microsoft/graph/exceptions/Error.java

diff --git a/build.gradle b/build.gradle
index ee44ab9bd..e1adb0ffc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -199,8 +199,8 @@ task sourceJar(type: Jar) {
 }
 
 compileJava {
-  sourceCompatibility = 1.7
-  targetCompatibility = 1.7
+  sourceCompatibility = 1.8
+  targetCompatibility = 1.8
 }
 
 def getVersionCode() {
diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index 08dfcb3e0..7ac66da99 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.authentication;
 
+import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.IHttpRequest;
 
 public interface IAuthenticationProvider {
diff --git a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
index 69959aae8..0c07a5f85 100644
--- a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.authentication;
 
+import com.microsoft.graph.exceptions.AuthenticationException;
 import okhttp3.Request;
 
 public interface ICoreAuthenticationProvider {
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index a1d3cbd68..439034534 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -3,6 +3,7 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
+import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.IHttpRequest;
 import okhttp3.Request;
 
@@ -15,6 +16,10 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     private AccessToken accessToken;
 
     public  TokenCredentialAuthProvider(TokenCredential tokenCredential) {
+        if(tokenCredential == null) {
+            throw new AuthenticationException(new Error(),new IllegalAccessException());
+        }
+
         this.tokenCredential = tokenCredential;
         this.context = new TokenRequestContext();
     }
@@ -32,19 +37,19 @@ public void authenticateRequest(IHttpRequest request) {
     @Override
     public Request authenticateRequest(Request request) {
         return request.newBuilder()
-                .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
-                .build();
+                    .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
+                    .build();
     }
 
     String getAccessToken() {
-        this.tokenCredential.getToken(this.context).subscribe(token -> {
+        this.tokenCredential.getToken(this.context).doOnSuccess(token -> {
             this.accessToken = token;
-        }, failToken ->{
-            //Do something if failure to receive the token
-            this.accessToken = null;
+        }).doOnError( exception -> {
+            exception.printStackTrace();
         });
         return this.accessToken.getToken();
     }
+   // throw AuthenticationException(new error(errorConstant.generalException, kjsdfhdfj, kkjsd), cause);
 
 
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
new file mode 100644
index 000000000..1af62bd4b
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -0,0 +1,22 @@
+package com.microsoft.graph.exceptions;
+
+import com.sun.deploy.uitoolkit.impl.fx.ui.ErrorPane;
+
+public class AuthenticationException extends Exception{
+
+    public Error error;
+    public Exception innerException;
+
+    public AuthenticationException(Error error) {
+        super(error.Message);
+        this.error = error;
+    }
+
+    public AuthenticationException(String message) {
+        super(message);
+    }
+
+    public AuthenticationException(Error error, Throwable rootCause) {
+        super(error.getMessage(), rootCause);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
new file mode 100644
index 000000000..2be74b1a5
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/exceptions/Error.java
@@ -0,0 +1,18 @@
+package com.microsoft.graph.exceptions;
+
+public class Error {
+
+    public String Code;
+    public String Message;
+    public String Target;
+
+
+    @Override
+    public String toString() {
+        return "";
+    }
+
+
+}
+
+

From 5ca70fd685e36bcda619d064413894e05b846167 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Tue, 28 Jul 2020 10:23:36 -0700
Subject: [PATCH 005/213] Error Class update

---
 .../TokenCredentialAuthProvider.java             |  5 +++--
 .../com/microsoft/graph/exceptions/Error.java    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 439034534..bcff920d0 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -4,6 +4,7 @@
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
 import com.microsoft.graph.exceptions.AuthenticationException;
+import com.microsoft.graph.exceptions.Error;
 import com.microsoft.graph.httpcore.IHttpRequest;
 import okhttp3.Request;
 
@@ -15,7 +16,7 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     private TokenRequestContext context;
     private AccessToken accessToken;
 
-    public  TokenCredentialAuthProvider(TokenCredential tokenCredential) {
+    public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws AuthenticationException {
         if(tokenCredential == null) {
             throw new AuthenticationException(new Error(),new IllegalAccessException());
         }
@@ -24,7 +25,7 @@ public  TokenCredentialAuthProvider(TokenCredential tokenCredential) {
         this.context = new TokenRequestContext();
     }
 
-    public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String> scopes) {
+    public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String> scopes) throws AuthenticationException {
         this(tokenCredential);
         this.context.setScopes(scopes);
     }
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
index 2be74b1a5..9e1fe34ff 100644
--- a/src/main/java/com/microsoft/graph/exceptions/Error.java
+++ b/src/main/java/com/microsoft/graph/exceptions/Error.java
@@ -6,6 +6,22 @@ public class Error {
     public String Message;
     public String Target;
 
+    public Error()
+    {}
+
+
+    public Error(String message)
+    {
+        this.Message = message;
+    }
+
+    public String getMessage(){return this.Message;}
+    public String getCode(){return this.Code;}
+    public String getTarget(){return this.Target;}
+
+    public void setMessage(String message){ this.Message = message; }
+    public void setCode(String code) { this.Code = code; }
+    public void setTarget(String target) { this.Target = target; }
 
     @Override
     public String toString() {

From 135471dcda1d5c479fc61a198b97cb563fbb0b84 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Tue, 28 Jul 2020 17:10:04 -0700
Subject: [PATCH 006/213] error constants and thrown error update

---
 build.gradle                                  |  4 ++-
 .../TokenCredentialAuthProvider.java          |  8 +++---
 .../exceptions/AuthenticationException.java   |  9 +++----
 .../com/microsoft/graph/exceptions/Error.java | 12 ++++-----
 .../graph/exceptions/ErrorConstants.java      | 15 +++++++++++
 .../TokenCredentialAuthProviderTest.java      | 16 ++++++++++++
 .../graph/mocks/MockTokenCredential.java      | 25 +++++++++++++++++++
 7 files changed, 71 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
 create mode 100644 src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
 create mode 100644 src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java

diff --git a/build.gradle b/build.gradle
index e1adb0ffc..bc4e3da90 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,9 @@ dependencies {
 
     // Use JUnit test framework
     testImplementation 'junit:junit:4.12'
-    
+    //Mockito Mock framework
+    testImplementation 'org.mockito:mockito-core:3.4.4'
+
     api 'com.squareup.okhttp3:okhttp:3.12.1'
     
     // https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index bcff920d0..4d0a70af5 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -7,6 +7,7 @@
 import com.microsoft.graph.exceptions.Error;
 import com.microsoft.graph.httpcore.IHttpRequest;
 import okhttp3.Request;
+import com.microsoft.graph.exceptions.ErrorConstants.*;
 
 import java.util.List;
 
@@ -18,7 +19,9 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
 
     public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws AuthenticationException {
         if(tokenCredential == null) {
-            throw new AuthenticationException(new Error(),new IllegalAccessException());
+            throw new AuthenticationException(new Error(Codes.InvalidArgument,
+                    String.format(Messages.nullParameter, "TokenCredential"))
+                    ,new IllegalArgumentException());
         }
 
         this.tokenCredential = tokenCredential;
@@ -50,7 +53,4 @@ String getAccessToken() {
         });
         return this.accessToken.getToken();
     }
-   // throw AuthenticationException(new error(errorConstant.generalException, kjsdfhdfj, kkjsd), cause);
-
-
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
index 1af62bd4b..703f14d25 100644
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -5,18 +5,15 @@
 public class AuthenticationException extends Exception{
 
     public Error error;
-    public Exception innerException;
 
     public AuthenticationException(Error error) {
-        super(error.Message);
+        super(error.getMessage());
         this.error = error;
     }
 
-    public AuthenticationException(String message) {
-        super(message);
-    }
-
     public AuthenticationException(Error error, Throwable rootCause) {
         super(error.getMessage(), rootCause);
+        this.error = error;
     }
+
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
index 9e1fe34ff..6b051413b 100644
--- a/src/main/java/com/microsoft/graph/exceptions/Error.java
+++ b/src/main/java/com/microsoft/graph/exceptions/Error.java
@@ -4,24 +4,22 @@ public class Error {
 
     public String Code;
     public String Message;
-    public String Target;
-
-    public Error()
-    {}
-
 
+    public Error(String code, String message) {
+        this.Code = code;
+        this.Message = message;
+    }
     public Error(String message)
     {
         this.Message = message;
     }
 
+
     public String getMessage(){return this.Message;}
     public String getCode(){return this.Code;}
-    public String getTarget(){return this.Target;}
 
     public void setMessage(String message){ this.Message = message; }
     public void setCode(String code) { this.Code = code; }
-    public void setTarget(String target) { this.Target = target; }
 
     @Override
     public String toString() {
diff --git a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
new file mode 100644
index 000000000..3781e2e41
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
@@ -0,0 +1,15 @@
+package com.microsoft.graph.exceptions;
+
+public final class ErrorConstants {
+
+    public static class Codes {
+        public static String GeneralException = "generalException";
+        public static String InvalidArgument = "invalidArgument";
+
+    }
+
+    public static class Messages {
+        public static String nullParameter = "%s parameter cannot be null.";
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
new file mode 100644
index 000000000..7b3bbf545
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -0,0 +1,16 @@
+package com.microsoft.graph.authentication;
+
+import com.azure.core.credential.TokenCredential;
+import com.microsoft.graph.mocks.MockTokenCredential;
+
+public class TokenCredentialAuthProviderTest {
+
+    private MockTokenCredential mockCredential;
+
+    public TokenCredentialAuthProviderTest() {
+        mockCredential = new MockTokenCredential();
+    }
+
+
+
+}
diff --git a/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java b/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
new file mode 100644
index 000000000..69673a10c
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
@@ -0,0 +1,25 @@
+package com.microsoft.graph.mocks;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.credential.TokenRequestContext;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import java.time.OffsetDateTime;
+
+
+public class MockTokenCredential {
+
+    TokenCredential mockCredential;
+    TokenRequestContext context;
+    String tokenValue = "TestTokenCredential";
+
+    public MockTokenCredential() {
+        this.mockCredential = Mockito.mock(TokenCredential.class);
+        this.context = Mockito.mock(TokenRequestContext.class);
+        AccessToken token = new AccessToken("TestTokenCredential", OffsetDateTime.now().plusMinutes(10));
+
+    }
+
+}

From 7b8fd3fa5c92aba227d9fab43e6ce595d964ed64 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Tue, 28 Jul 2020 17:42:55 -0700
Subject: [PATCH 007/213] deleted lines

---
 src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
index 3781e2e41..d10782638 100644
--- a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
+++ b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
@@ -11,5 +11,4 @@ public static class Codes {
     public static class Messages {
         public static String nullParameter = "%s parameter cannot be null.";
     }
-
 }

From 77485fccf40dc04ebcaa9128eabb3192ee88831c Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Wed, 29 Jul 2020 13:59:10 -0700
Subject: [PATCH 008/213] first unit test

---
 .../TokenCredentialAuthProvider.java          |  5 ++--
 .../TokenCredentialAuthProviderTest.java      | 30 +++++++++++++++++--
 .../graph/mocks/MockTokenCredential.java      | 17 +++++------
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 4d0a70af5..fc6129a64 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -46,10 +46,9 @@ public Request authenticateRequest(Request request) {
     }
 
     String getAccessToken() {
-        this.tokenCredential.getToken(this.context).doOnSuccess(token -> {
+        this.tokenCredential.getToken(this.context).doOnError(exception -> exception.printStackTrace())
+                .subscribe(token -> {
             this.accessToken = token;
-        }).doOnError( exception -> {
-            exception.printStackTrace();
         });
         return this.accessToken.getToken();
     }
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 7b3bbf545..4f0ca0cc5 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -1,16 +1,40 @@
 package com.microsoft.graph.authentication;
 
 import com.azure.core.credential.TokenCredential;
+import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.mocks.MockTokenCredential;
+import okhttp3.Request;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 public class TokenCredentialAuthProviderTest {
 
-    private MockTokenCredential mockCredential;
+    public final String testToken = "CredentialTestToken";
+
+    @Test
+    public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
+
+        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
+        TokenCredential mockCredential = new MockTokenCredential().getMockTokenCredential();
+
+        TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+        Request newRequest = authProvider.authenticateRequest(request);
+
+        assertEquals(newRequest.toString(), request.newBuilder()
+                .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + testToken)
+                .build().toString());
+        assertEquals(testToken, authProvider.getAccessToken());
 
-    public TokenCredentialAuthProviderTest() {
-        mockCredential = new MockTokenCredential();
     }
 
+    @Test
+    public void TokenCredentialAuthProviderTestIAuthentication() {
+
+    }
+
+
 
 
 }
diff --git a/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java b/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
index 69673a10c..c9e29f9d9 100644
--- a/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
+++ b/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
@@ -3,23 +3,22 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
-import org.mockito.Mock;
 import org.mockito.Mockito;
+import reactor.core.publisher.Mono;
 
 import java.time.OffsetDateTime;
 
 
 public class MockTokenCredential {
 
-    TokenCredential mockCredential;
-    TokenRequestContext context;
-    String tokenValue = "TestTokenCredential";
-
-    public MockTokenCredential() {
-        this.mockCredential = Mockito.mock(TokenCredential.class);
-        this.context = Mockito.mock(TokenRequestContext.class);
-        AccessToken token = new AccessToken("TestTokenCredential", OffsetDateTime.now().plusMinutes(10));
+    public final static String testToken = "CredentialTestToken";
 
+    public static TokenCredential getMockTokenCredential() {
+        TokenCredential mockCredential = Mockito.mock(TokenCredential.class);
+        TokenRequestContext context = new TokenRequestContext();
+        Mono<AccessToken> token = Mono.just(new AccessToken(testToken, OffsetDateTime.now().plusMinutes(10)));
+        Mockito.when(mockCredential.getToken(context).thenReturn(token));
+        return mockCredential;
     }
 
 }

From cee9942f1b8a649b525f50ed1951cd8f2a343e62 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Thu, 30 Jul 2020 18:59:26 -0700
Subject: [PATCH 009/213] Java docs and testing updated

---
 .../TokenCredentialAuthProvider.java          |  31 ++++-
 .../exceptions/AuthenticationException.java   |  11 ++
 .../com/microsoft/graph/exceptions/Error.java |  57 ++++++++-
 .../graph/exceptions/ErrorConstants.java      |   2 +-
 .../TokenCredentialAuthProviderTest.java      |  32 +++--
 .../graph/mocks/MockIHttpRequest.java         | 121 ++++++++++++++++++
 6 files changed, 240 insertions(+), 14 deletions(-)
 create mode 100644 src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index fc6129a64..599cdcfb4 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -17,10 +17,16 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     private TokenRequestContext context;
     private AccessToken accessToken;
 
+    /**
+     * Creates an Authentication provider using a passed in TokenCredential
+     *
+     * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
+     * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
+     */
     public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws AuthenticationException {
         if(tokenCredential == null) {
             throw new AuthenticationException(new Error(Codes.InvalidArgument,
-                    String.format(Messages.nullParameter, "TokenCredential"))
+                    String.format(Messages.NullParameter, "TokenCredential"))
                     ,new IllegalArgumentException());
         }
 
@@ -28,16 +34,34 @@ public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws Auth
         this.context = new TokenRequestContext();
     }
 
+    /**
+     *Created an Authentication provider using a TokenCredential and list of scopes
+     *
+     * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
+     * @param scopes Specified desired scopes of the Auth Provider
+     * @throws AuthenticationException
+     */
     public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String> scopes) throws AuthenticationException {
         this(tokenCredential);
         this.context.setScopes(scopes);
     }
 
+    /**
+     * Authenticates the request
+     *
+     * @param request the request to authenticate
+     */
     @Override
     public void authenticateRequest(IHttpRequest request) {
         request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
     }
 
+    /**
+     * Authenticates the request
+     *
+     * @param request the request to authenticate
+     * @return Request with Authorization header added to it
+     */
     @Override
     public Request authenticateRequest(Request request) {
         return request.newBuilder()
@@ -45,6 +69,11 @@ public Request authenticateRequest(Request request) {
                     .build();
     }
 
+    /**
+     * Returns an AccessToken as a string
+     *
+     * @return String representing the retrieved AccessToken
+     */
     String getAccessToken() {
         this.tokenCredential.getToken(this.context).doOnError(exception -> exception.printStackTrace())
                 .subscribe(token -> {
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
index 703f14d25..755db17bc 100644
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -6,11 +6,22 @@ public class AuthenticationException extends Exception{
 
     public Error error;
 
+    /**
+     *Creates a new AuthenticationException with a specified Error
+     *
+     * @param error The specifying error causing exception to be thrown
+     */
     public AuthenticationException(Error error) {
         super(error.getMessage());
         this.error = error;
     }
 
+    /**
+     *Creates a new AuthenticationException with a specified Error as well as an inner exception
+     *
+     * @param error The specified error causing exception to be thrown
+     * @param rootCause The underlying exception causing AuthenticationException to be thrown
+     */
     public AuthenticationException(Error error, Throwable rootCause) {
         super(error.getMessage(), rootCause);
         this.error = error;
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
index 6b051413b..e88d03b3c 100644
--- a/src/main/java/com/microsoft/graph/exceptions/Error.java
+++ b/src/main/java/com/microsoft/graph/exceptions/Error.java
@@ -2,28 +2,79 @@
 
 public class Error {
 
+    //Error Code specifying error type
     public String Code;
+    //Error Message describing error
     public String Message;
 
+    /**
+     * Creates a new error with a specified message and code
+     *
+     * @param code The specified error code
+     * @param message The specified error message
+     */
     public Error(String code, String message) {
         this.Code = code;
         this.Message = message;
     }
+
+    /**
+     * Creates a new error with a specified message
+     *
+     * @param message The specified error message
+     */
     public Error(String message)
     {
         this.Message = message;
     }
 
-
+    /**
+     * Get the error message
+     *
+     * @return the error message
+     */
     public String getMessage(){return this.Message;}
+
+    /**
+     * Get the error code
+     *
+     * @return the error code
+     */
     public String getCode(){return this.Code;}
 
+    /**
+     * Set the error message
+     *
+     * @param message the error message
+     */
     public void setMessage(String message){ this.Message = message; }
+
+    /**
+     * Set the error code
+     *
+     * @param code the error code
+     */
     public void setCode(String code) { this.Code = code; }
 
-    @Override
+    /**
+     * Returns a string with the specified error details
+     *
+     * @return the error details as a String
+     */
     public String toString() {
-        return "";
+        StringBuilder errorString = new StringBuilder();
+
+        if(this.Code != null) {
+            errorString.append(String.format("Code: %s", this.Code));
+            errorString.append(System.lineSeparator());
+        }
+
+        if(this.Message != null){
+            errorString.append(String.format("Message: %s", this.Message));
+            errorString.append(System.lineSeparator());
+        }
+
+        return errorString.toString();
     }
 
 
diff --git a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
index d10782638..23f9ddf92 100644
--- a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
+++ b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
@@ -9,6 +9,6 @@ public static class Codes {
     }
 
     public static class Messages {
-        public static String nullParameter = "%s parameter cannot be null.";
+        public static String NullParameter = "%s parameter cannot be null.";
     }
 }
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 4f0ca0cc5..827be4c96 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -2,11 +2,16 @@
 
 import com.azure.core.credential.TokenCredential;
 import com.microsoft.graph.exceptions.AuthenticationException;
+import com.microsoft.graph.httpcore.IHttpRequest;
+import com.microsoft.graph.mocks.MockIHttpRequest;
 import com.microsoft.graph.mocks.MockTokenCredential;
+import com.microsoft.graph.options.HeaderOption;
 import okhttp3.Request;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.List;
+
 import static org.junit.Assert.*;
 
 public class TokenCredentialAuthProviderTest {
@@ -16,22 +21,31 @@ public class TokenCredentialAuthProviderTest {
     @Test
     public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
 
-        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
-        TokenCredential mockCredential = new MockTokenCredential().getMockTokenCredential();
-
+        //Arange
+        Request request = new Request.Builder().url("https://localhost").build();
+        TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
         TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
-        Request newRequest = authProvider.authenticateRequest(request);
 
-        assertEquals(newRequest.toString(), request.newBuilder()
-                .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + testToken)
-                .build().toString());
-        assertEquals(testToken, authProvider.getAccessToken());
+        //Act
+        Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
+        Request authenticatedRequest = authProvider.authenticateRequest(request);
 
+        //Assert
+        Assert.assertEquals(request.url(), authenticatedRequest.url());
+        Assert.assertNotNull(authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
+        assertEquals(AuthConstants.BEARER + testToken, authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
     }
 
     @Test
-    public void TokenCredentialAuthProviderTestIAuthentication() {
+    public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException {
+        TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+        MockIHttpRequest request = new MockIHttpRequest("https://localhost");
+        TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+
+        Assert.assertFalse(request.getHeaders().contains(new HeaderOption(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + this.testToken)));
+        authProvider.authenticateRequest(request);
 
+        Assert.assertTrue(request.getHeaders().contains(new HeaderOption(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + this.testToken)));
     }
 
 
diff --git a/src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java b/src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java
new file mode 100644
index 000000000..26fdd9ad3
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java
@@ -0,0 +1,121 @@
+package com.microsoft.graph.mocks;
+
+import java.net.URI;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.microsoft.graph.httpcore.HttpMethod;
+import com.microsoft.graph.httpcore.IHttpRequest;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
+
+
+/**
+ * Dummy class implementing IHttpRequest used for testing
+ */
+public class MockIHttpRequest implements IHttpRequest {
+
+    private final List<HeaderOption> headersOptions;
+    private String requestUrl;
+
+    public MockIHttpRequest(String requestUrl)
+    {
+        headersOptions = new ArrayList<>();
+        this.requestUrl = requestUrl;
+    }
+
+    @Override
+    public URL getRequestUrl() {
+        URI baseUrl = URI.create(requestUrl);
+        try {
+            return new URL(baseUrl.toString());
+        } catch (final MalformedURLException e) {
+        }
+        return null;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return null;
+    }
+
+    @Override
+    public List<HeaderOption> getHeaders() {
+        return headersOptions;
+    }
+
+    @Override
+    public List<Option> getOptions() {
+        return null;
+    }
+
+    @Override
+    public void addHeader(final String header, final String value) {
+        headersOptions.add(new HeaderOption(header, value));
+    }
+
+
+    @Override
+    public void setUseCaches(boolean useCaches) {
+
+    }
+
+    @Override
+    public boolean getUseCaches() {
+        return false;
+    }
+
+    @Override
+    public void setMaxRedirects(int maxRedirects) {
+
+    }
+
+    @Override
+    public int getMaxRedirects() {
+        return 0;
+    }
+
+    @Override
+    public void setShouldRedirect(IShouldRedirect shouldRedirect) {
+
+    }
+
+    @Override
+    public IShouldRedirect getShouldRedirect() {
+        return null;
+    }
+
+    @Override
+    public void setShouldRetry(IShouldRetry shouldretry) {
+
+    }
+
+    @Override
+    public IShouldRetry getShouldRetry() {
+        return null;
+    }
+
+    @Override
+    public void setMaxRetries(int maxRetries) {
+
+    }
+
+    @Override
+    public int getMaxRetries() {
+        return 0;
+    }
+
+    @Override
+    public void setDelay(long delay) {
+
+    }
+
+    @Override
+    public long getDelay() {
+        return 0;
+    }
+}

From 03f05bfcac8a83b1f29f9bf09beb04748688ea5e Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Fri, 31 Jul 2020 12:44:35 -0700
Subject: [PATCH 010/213] Passed tests and javadocs are complete

---
 .../TokenCredentialAuthProvider.java              |  3 +++
 .../graph/exceptions/AuthenticationException.java |  2 +-
 .../com/microsoft/graph/exceptions/Error.java     |  2 --
 .../TokenCredentialAuthProviderTest.java          | 15 ++++++++-------
 .../graph/mocks/MockTokenCredential.java          |  4 +---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 599cdcfb4..bf1bfea1d 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -13,8 +13,11 @@
 
 public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
 
+    //TokenCredential expected form user
     private TokenCredential tokenCredential;
+    //Context options which can be optionally set by the user
     private TokenRequestContext context;
+    //Access token to be retrieved
     private AccessToken accessToken;
 
     /**
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
index 755db17bc..0b2bf3b92 100644
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -4,6 +4,7 @@
 
 public class AuthenticationException extends Exception{
 
+    //Error object to store details of thrown Exception
     public Error error;
 
     /**
@@ -26,5 +27,4 @@ public AuthenticationException(Error error, Throwable rootCause) {
         super(error.getMessage(), rootCause);
         this.error = error;
     }
-
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
index e88d03b3c..03d9596d1 100644
--- a/src/main/java/com/microsoft/graph/exceptions/Error.java
+++ b/src/main/java/com/microsoft/graph/exceptions/Error.java
@@ -76,8 +76,6 @@ public String toString() {
 
         return errorString.toString();
     }
-
-
 }
 
 
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 827be4c96..9d6278c42 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -21,7 +21,7 @@ public class TokenCredentialAuthProviderTest {
     @Test
     public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
 
-        //Arange
+        //Arrange
         Request request = new Request.Builder().url("https://localhost").build();
         TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
         TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
@@ -38,17 +38,18 @@ public void TokenCredentialAuthProviderTestICoreAuthentication() throws Authenti
 
     @Test
     public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException {
+
+        //Arrange
         TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
         MockIHttpRequest request = new MockIHttpRequest("https://localhost");
         TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
-        Assert.assertFalse(request.getHeaders().contains(new HeaderOption(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + this.testToken)));
+        //Act
+        Assert.assertTrue(request.getHeaders().isEmpty());
         authProvider.authenticateRequest(request);
 
-        Assert.assertTrue(request.getHeaders().contains(new HeaderOption(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + this.testToken)));
+        //Assert
+        Assert.assertTrue(request.getHeaders().get(0).getName().equals(AuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertTrue(request.getHeaders().get(0).getValue().equals(AuthConstants.BEARER + this.testToken));
     }
-
-
-
-
 }
diff --git a/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java b/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
index c9e29f9d9..0be791f6e 100644
--- a/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
+++ b/src/test/java/com/microsoft/graph/mocks/MockTokenCredential.java
@@ -15,10 +15,8 @@ public class MockTokenCredential {
 
     public static TokenCredential getMockTokenCredential() {
         TokenCredential mockCredential = Mockito.mock(TokenCredential.class);
-        TokenRequestContext context = new TokenRequestContext();
         Mono<AccessToken> token = Mono.just(new AccessToken(testToken, OffsetDateTime.now().plusMinutes(10)));
-        Mockito.when(mockCredential.getToken(context).thenReturn(token));
+        Mockito.when(mockCredential.getToken(Mockito.any())).thenReturn(token);
         return mockCredential;
     }
-
 }

From 87dfbe509020f9761b0b431bc6e2dc33a970e889 Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Fri, 31 Jul 2020 15:10:46 -0700
Subject: [PATCH 011/213] Update TokenCredentialAuthProvider.java

---
 .../graph/authentication/TokenCredentialAuthProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index bf1bfea1d..5508d7a74 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -42,7 +42,7 @@ public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws Auth
      *
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider
-     * @throws AuthenticationException
+     * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
     public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String> scopes) throws AuthenticationException {
         this(tokenCredential);

From c5b3149b6ba17a0c9718eebbd241bc7e374843ec Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Mon, 3 Aug 2020 12:15:17 -0700
Subject: [PATCH 012/213] Update
 src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java

Co-authored-by: DeVere Dyett <ddyett@microsoft.com>
---
 .../graph/authentication/TokenCredentialAuthProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 5508d7a74..e45532f95 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -38,7 +38,7 @@ public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws Auth
     }
 
     /**
-     *Created an Authentication provider using a TokenCredential and list of scopes
+     * Creates an Authentication provider using a TokenCredential and list of scopes
      *
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider

From 0795e85429e787a4e21deaf961bb375178484e6c Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Mon, 3 Aug 2020 12:15:49 -0700
Subject: [PATCH 013/213] Update
 src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java

Co-authored-by: DeVere Dyett <ddyett@microsoft.com>
---
 .../graph/authentication/TokenCredentialAuthProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index e45532f95..f14a6b78d 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -13,7 +13,7 @@
 
 public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
 
-    //TokenCredential expected form user
+    //TokenCredential expected from user
     private TokenCredential tokenCredential;
     //Context options which can be optionally set by the user
     private TokenRequestContext context;

From 0c47e8159af9008790fb3e2a7b40155ec1598d21 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Mon, 3 Aug 2020 14:31:13 -0700
Subject: [PATCH 014/213] deleted unused import statements

---
 .../microsoft/graph/authentication/IAuthenticationProvider.java | 1 -
 .../graph/authentication/ICoreAuthenticationProvider.java       | 1 -
 .../com/microsoft/graph/exceptions/AuthenticationException.java | 2 --
 3 files changed, 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index 7ac66da99..08dfcb3e0 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -1,6 +1,5 @@
 package com.microsoft.graph.authentication;
 
-import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.IHttpRequest;
 
 public interface IAuthenticationProvider {
diff --git a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
index 0c07a5f85..69959aae8 100644
--- a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
@@ -1,6 +1,5 @@
 package com.microsoft.graph.authentication;
 
-import com.microsoft.graph.exceptions.AuthenticationException;
 import okhttp3.Request;
 
 public interface ICoreAuthenticationProvider {
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
index 0b2bf3b92..7807f0e22 100644
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -1,7 +1,5 @@
 package com.microsoft.graph.exceptions;
 
-import com.sun.deploy.uitoolkit.impl.fx.ui.ErrorPane;
-
 public class AuthenticationException extends Exception{
 
     //Error object to store details of thrown Exception

From 33683f0c174f7fb605ad11bc3d35c1cea989f3b7 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Fri, 7 Aug 2020 11:37:58 -0700
Subject: [PATCH 015/213] scoped down accessToken variable

---
 .../graph/authentication/TokenCredentialAuthProvider.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index f14a6b78d..64669f00c 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -17,8 +17,6 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     private TokenCredential tokenCredential;
     //Context options which can be optionally set by the user
     private TokenRequestContext context;
-    //Access token to be retrieved
-    private AccessToken accessToken;
 
     /**
      * Creates an Authentication provider using a passed in TokenCredential
@@ -78,10 +76,11 @@ public Request authenticateRequest(Request request) {
      * @return String representing the retrieved AccessToken
      */
     String getAccessToken() {
+        String[] accessToken = new String[1];
         this.tokenCredential.getToken(this.context).doOnError(exception -> exception.printStackTrace())
                 .subscribe(token -> {
-            this.accessToken = token;
+            accessToken[0] = token.getToken();
         });
-        return this.accessToken.getToken();
+        return accessToken[0];
     }
 }

From 21ca3dcfdbf060b38e835eb67ca0c2bc9eaefc62 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Tue, 11 Aug 2020 22:05:12 -0700
Subject: [PATCH 016/213] renaming

---
 {Scripts => scripts}/getLatestVersion.ps1     | 0
 {Scripts => scripts}/validateMavenVersion.ps1 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {Scripts => scripts}/getLatestVersion.ps1 (100%)
 rename {Scripts => scripts}/validateMavenVersion.ps1 (100%)

diff --git a/Scripts/getLatestVersion.ps1 b/scripts/getLatestVersion.ps1
similarity index 100%
rename from Scripts/getLatestVersion.ps1
rename to scripts/getLatestVersion.ps1
diff --git a/Scripts/validateMavenVersion.ps1 b/scripts/validateMavenVersion.ps1
similarity index 100%
rename from Scripts/validateMavenVersion.ps1
rename to scripts/validateMavenVersion.ps1

From 18ab5b9e190c260961f065a723c38dd87f9bee52 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Tue, 11 Aug 2020 23:25:29 -0700
Subject: [PATCH 017/213] move sourcejar in build.gradle

---
 build.gradle | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index bc4e3da90..10212a225 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,6 +53,17 @@ def pomConfig = {
     }
 }
 
+task sourceJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allJava
+}
+
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
 //Publishing tasks-
 //Maven Central Snapshot: publishSnapshotPublicationToMavenRepository
 //Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
@@ -195,11 +206,6 @@ publishing {
 
 }
 
-task sourceJar(type: Jar) {
-  classifier = 'sources'
-  from sourceSets.main.allJava
-}
-
 compileJava {
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
@@ -265,11 +271,6 @@ uploadArchives {
 
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
 artifacts {
 	archives jar
 	archives sourceJar

From 16fd056ec16dcdb1c17d264d648ed132dc00f3f4 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Tue, 11 Aug 2020 23:31:44 -0700
Subject: [PATCH 018/213] move signing task

---
 build.gradle | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 10212a225..4b8cc7aea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,12 +58,16 @@ task sourceJar(type: Jar) {
     from sourceSets.main.allJava
 }
 
-
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from javadoc.destinationDir
 }
 
+signing {
+    sign configurations.archives
+}
+tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
+
 //Publishing tasks-
 //Maven Central Snapshot: publishSnapshotPublicationToMavenRepository
 //Maven Central Release: publishMavenCentralReleasePublicationToMaven2Repository
@@ -277,11 +281,6 @@ artifacts {
 	archives javadocJar
 }
 
-signing {
-	sign configurations.archives
-}
-tasks.withType(Sign)*.enabled = mavenCentralPublishingEnabled.toBoolean()
-
 def customizePom(pom) {
     pom.withXml {
         def root = asNode()

From d40ce24de28f0c6554705bfd0e37c4c7d979fc20 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Wed, 12 Aug 2020 19:43:17 -0700
Subject: [PATCH 019/213] add sample project

---
 samples/deviceCodeSample/build.gradle         | 17 +++++++
 .../gradle/wrapper/gradle-wrapper.properties  |  5 ++
 samples/deviceCodeSample/settings.gradle      |  4 ++
 .../src/main/java/deviceCodeFlowMain.java     | 46 +++++++++++++++++++
 .../TokenCredentialAuthProvider.java          | 14 +++---
 5 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 samples/deviceCodeSample/build.gradle
 create mode 100644 samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 samples/deviceCodeSample/settings.gradle
 create mode 100644 samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java

diff --git a/samples/deviceCodeSample/build.gradle b/samples/deviceCodeSample/build.gradle
new file mode 100644
index 000000000..5c1ecabdd
--- /dev/null
+++ b/samples/deviceCodeSample/build.gradle
@@ -0,0 +1,17 @@
+plugins {
+    id 'java'
+}
+
+group 'org.example'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation project(':coreLibrary')
+    implementation 'com.azure:azure-identity:1.0.8'
+    implementation 'com.azure:azure-security-keyvault-secrets:4.1.5'
+}
diff --git a/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties b/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..a4b442974
--- /dev/null
+++ b/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/samples/deviceCodeSample/settings.gradle b/samples/deviceCodeSample/settings.gradle
new file mode 100644
index 000000000..79a5cd38a
--- /dev/null
+++ b/samples/deviceCodeSample/settings.gradle
@@ -0,0 +1,4 @@
+include 'coreLibrary'
+
+project(':coreLibrary').projectDir = new File("../../")
+
diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
new file mode 100644
index 000000000..24b71e3b5
--- /dev/null
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -0,0 +1,46 @@
+import com.azure.identity.DeviceCodeCredential;
+import com.azure.identity.DeviceCodeCredentialBuilder;
+import com.azure.security.keyvault.secrets.SecretClient;
+import com.microsoft.graph.authentication.TokenCredentialAuthProvider;
+import com.microsoft.graph.exceptions.AuthenticationException;
+import com.microsoft.graph.httpcore.HttpClients;
+import okhttp3.*;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+
+public class deviceCodeFlowMain {
+
+    public static void main(String[] args) throws AuthenticationException {
+        deviceCodeFlow();
+    }
+
+    public static void deviceCodeFlow() throws AuthenticationException {
+
+        List<String> scopes = Arrays.asList("user.ReadBasic.All", "User.Read");
+
+        DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
+                .clientId("cfb5d84c-c88f-466c-81fb-0fe9fa8da052")
+                .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
+                .build();
+
+        TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, scopes);
+        OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
+
+        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
+
+        httpClient.newCall(request).enqueue(new Callback() {
+            public void onResponse(Call call, Response response) throws IOException {
+                String responseBody = response.body().string();
+                System.out.println(responseBody);
+            }
+
+            @Override
+            public void onFailure(Call call, IOException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 64669f00c..177dd0f2b 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -76,11 +76,13 @@ public Request authenticateRequest(Request request) {
      * @return String representing the retrieved AccessToken
      */
     String getAccessToken() {
-        String[] accessToken = new String[1];
-        this.tokenCredential.getToken(this.context).doOnError(exception -> exception.printStackTrace())
-                .subscribe(token -> {
-            accessToken[0] = token.getToken();
-        });
-        return accessToken[0];
+        String accessToken = null;
+        try {
+            AccessToken token = this.tokenCredential.getToken(this.context).block();
+            accessToken = token.getToken();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return  accessToken;
     }
 }

From 489ddeb9dc0163b1a0890cbdb9973042e36e4fb6 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Wed, 12 Aug 2020 19:45:33 -0700
Subject: [PATCH 020/213] update getAccessToken to wait until auth is done

---
 .../TokenCredentialAuthProvider.java               | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 64669f00c..177dd0f2b 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -76,11 +76,13 @@ public Request authenticateRequest(Request request) {
      * @return String representing the retrieved AccessToken
      */
     String getAccessToken() {
-        String[] accessToken = new String[1];
-        this.tokenCredential.getToken(this.context).doOnError(exception -> exception.printStackTrace())
-                .subscribe(token -> {
-            accessToken[0] = token.getToken();
-        });
-        return accessToken[0];
+        String accessToken = null;
+        try {
+            AccessToken token = this.tokenCredential.getToken(this.context).block();
+            accessToken = token.getToken();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return  accessToken;
     }
 }

From da82270759185c1c58609970df372b80e3f7692e Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Thu, 13 Aug 2020 01:15:09 -0700
Subject: [PATCH 021/213] remove dependency

---
 samples/deviceCodeSample/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/deviceCodeSample/build.gradle b/samples/deviceCodeSample/build.gradle
index 5c1ecabdd..d22041dd0 100644
--- a/samples/deviceCodeSample/build.gradle
+++ b/samples/deviceCodeSample/build.gradle
@@ -13,5 +13,4 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     implementation project(':coreLibrary')
     implementation 'com.azure:azure-identity:1.0.8'
-    implementation 'com.azure:azure-security-keyvault-secrets:4.1.5'
 }

From ce9292decd4633ac95aa83af630b00a93ae9271a Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Thu, 13 Aug 2020 15:08:57 -0700
Subject: [PATCH 022/213] removed uneccessary import statement

---
 samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 24b71e3b5..1025539b4 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -1,6 +1,5 @@
 import com.azure.identity.DeviceCodeCredential;
 import com.azure.identity.DeviceCodeCredentialBuilder;
-import com.azure.security.keyvault.secrets.SecretClient;
 import com.microsoft.graph.authentication.TokenCredentialAuthProvider;
 import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.HttpClients;

From 1ae1a94ca238b53f48c04c65d2686115d4adfb19 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Thu, 13 Aug 2020 22:19:47 -0700
Subject: [PATCH 023/213] interactive browser on console

---
 samples/interactiveBrowserSample/build.gradle | 16 +++++
 .../interactiveBrowserSample/settings.gradle  |  5 ++
 .../main/java/interactiveBrowserSample.java   | 59 +++++++++++++++++++
 3 files changed, 80 insertions(+)
 create mode 100644 samples/interactiveBrowserSample/build.gradle
 create mode 100644 samples/interactiveBrowserSample/settings.gradle
 create mode 100644 samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java

diff --git a/samples/interactiveBrowserSample/build.gradle b/samples/interactiveBrowserSample/build.gradle
new file mode 100644
index 000000000..819657ea5
--- /dev/null
+++ b/samples/interactiveBrowserSample/build.gradle
@@ -0,0 +1,16 @@
+plugins {
+    id 'java'
+}
+
+group 'org.example'
+version '1.0-SNAPSHOT'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation project(':coreLibrary')
+    implementation 'com.azure:azure-identity:1.1.0'
+}
diff --git a/samples/interactiveBrowserSample/settings.gradle b/samples/interactiveBrowserSample/settings.gradle
new file mode 100644
index 000000000..b6260dfbe
--- /dev/null
+++ b/samples/interactiveBrowserSample/settings.gradle
@@ -0,0 +1,5 @@
+include 'coreLibrary'
+
+project(':coreLibrary').projectDir = new File("../../")
+
+
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
new file mode 100644
index 000000000..72d1455bb
--- /dev/null
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
@@ -0,0 +1,59 @@
+import java.io.IOException;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.azure.identity.DeviceCodeCredential;
+import com.azure.identity.DeviceCodeCredentialBuilder;
+import com.azure.identity.InteractiveBrowserCredential;
+import com.azure.identity.InteractiveBrowserCredentialBuilder;
+import com.microsoft.graph.authentication.*;
+import okhttp3.*;
+import com.microsoft.graph.httpcore.HttpClients;
+import com.microsoft.graph.exceptions.*;
+
+public class interactiveBrowserSample {
+    private final static String CLIENT_ID = "fa62d88a-02fa-4893-88b3-8e566c7ad6f5";
+    private final static String AUTHORITY = "https://login.microsoftonline.com/common/";
+    private final static List<String> SCOPE = Stream.of("user.read").collect(Collectors.toList());
+
+    public static void main(String args[]) throws Exception {
+        getUserWithHttp();
+    }
+
+    private static void getUserWithHttp() throws AuthenticationException{
+        DeviceCodeCredential deviceCodeCredential = new DeviceCodeCredentialBuilder()
+                .challengeConsumer(challenge -> {
+                    // lets user know of the challenge
+                    System.out.println(challenge.getMessage());
+                })
+                .clientId(CLIENT_ID)
+                .authorityHost(AUTHORITY)
+                .build();
+
+//        InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
+//                .clientId(CLIENT_ID)
+//                .port(8765)
+//                .build();
+
+        TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(deviceCodeCredential,SCOPE);
+        OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
+
+        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
+
+        httpClient.newCall(request).enqueue(new Callback() {
+            @Override
+            public void onResponse(Call call, Response response) throws IOException {
+                String responseBody = response.body().string();
+                // Your processing with the response body
+                System.out.println(responseBody);
+            }
+
+            @Override
+            public void onFailure(Call call, IOException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+}

From 4d604eb20d78788ecfdad26c6534c4a2c0f58f7f Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Thu, 13 Aug 2020 22:43:43 -0700
Subject: [PATCH 024/213] interactive browser auth

---
 samples/interactiveBrowserSample/build.gradle |  2 +-
 .../main/java/interactiveBrowserSample.java   | 33 ++++++-------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/samples/interactiveBrowserSample/build.gradle b/samples/interactiveBrowserSample/build.gradle
index 819657ea5..d22041dd0 100644
--- a/samples/interactiveBrowserSample/build.gradle
+++ b/samples/interactiveBrowserSample/build.gradle
@@ -12,5 +12,5 @@ repositories {
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     implementation project(':coreLibrary')
-    implementation 'com.azure:azure-identity:1.1.0'
+    implementation 'com.azure:azure-identity:1.0.8'
 }
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
index 72d1455bb..2905fb9f3 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
@@ -1,10 +1,6 @@
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import com.azure.identity.DeviceCodeCredential;
-import com.azure.identity.DeviceCodeCredentialBuilder;
 import com.azure.identity.InteractiveBrowserCredential;
 import com.azure.identity.InteractiveBrowserCredentialBuilder;
 import com.microsoft.graph.authentication.*;
@@ -13,30 +9,22 @@
 import com.microsoft.graph.exceptions.*;
 
 public class interactiveBrowserSample {
-    private final static String CLIENT_ID = "fa62d88a-02fa-4893-88b3-8e566c7ad6f5";
-    private final static String AUTHORITY = "https://login.microsoftonline.com/common/";
-    private final static List<String> SCOPE = Stream.of("user.read").collect(Collectors.toList());
+
+    private final static String CLIENT_ID = "199e4de3-dd3b-4a51-b78a-86b801246e20";
+    private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All");
 
     public static void main(String args[]) throws Exception {
-        getUserWithHttp();
+        interactiveBrowser();
     }
 
-    private static void getUserWithHttp() throws AuthenticationException{
-        DeviceCodeCredential deviceCodeCredential = new DeviceCodeCredentialBuilder()
-                .challengeConsumer(challenge -> {
-                    // lets user know of the challenge
-                    System.out.println(challenge.getMessage());
-                })
+    private static void interactiveBrowser() throws AuthenticationException{
+
+        InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
                 .clientId(CLIENT_ID)
-                .authorityHost(AUTHORITY)
+                .port(8765)
                 .build();
 
-//        InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
-//                .clientId(CLIENT_ID)
-//                .port(8765)
-//                .build();
-
-        TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(deviceCodeCredential,SCOPE);
+        TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(interactiveBrowserCredential,SCOPES);
         OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
 
         Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
@@ -45,7 +33,6 @@ private static void getUserWithHttp() throws AuthenticationException{
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 String responseBody = response.body().string();
-                // Your processing with the response body
                 System.out.println(responseBody);
             }
 

From 9940acf58a6336e029e6f517d6c27b621bfb45a9 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Fri, 14 Aug 2020 00:33:11 -0700
Subject: [PATCH 025/213] pasrsed through the response, removed metadata tag

---
 .../main/java/interactiveBrowserSample.java   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
index 2905fb9f3..4bf67ad79 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
@@ -3,14 +3,23 @@
 import java.util.List;
 import com.azure.identity.InteractiveBrowserCredential;
 import com.azure.identity.InteractiveBrowserCredentialBuilder;
+import com.google.gson.annotations.JsonAdapter;
 import com.microsoft.graph.authentication.*;
 import okhttp3.*;
 import com.microsoft.graph.httpcore.HttpClients;
 import com.microsoft.graph.exceptions.*;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 public class interactiveBrowserSample {
 
+    //Replace CLIENT_ID with your own client id from an adequately configured app
+    //for requirements visit:
+    //https://github.com/Azure/azure-sdk-for-java/wiki/Set-up-Your-Environment-for-Authentication#enable-applications-for-interactive-browser-oauth-2-flow
     private final static String CLIENT_ID = "199e4de3-dd3b-4a51-b78a-86b801246e20";
+
+    //Set the scopes for your ms-graph request
     private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All");
 
     public static void main(String args[]) throws Exception {
@@ -32,8 +41,14 @@ private static void interactiveBrowser() throws AuthenticationException{
         httpClient.newCall(request).enqueue(new Callback() {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-                String responseBody = response.body().string();
-                System.out.println(responseBody);
+                JSONParser jsonParser = new JSONParser();
+                JSONObject responseJson = null;
+                try {
+                    responseJson = (JSONObject) jsonParser.parse(response.body().string());
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                System.out.println(responseJson);
             }
 
             @Override
@@ -42,5 +57,4 @@ public void onFailure(Call call, IOException e) {
             }
         });
     }
-
 }

From 060b0de119f91741ff5055de152b1c1038fd5be1 Mon Sep 17 00:00:00 2001
From: ramsessanchez <63934382+ramsessanchez@users.noreply.github.com>
Date: Fri, 14 Aug 2020 00:39:20 -0700
Subject: [PATCH 026/213] Update TokenCredentialAuthProvider.java

---
 .../graph/authentication/TokenCredentialAuthProvider.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 177dd0f2b..1527547f8 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -18,6 +18,9 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     //Context options which can be optionally set by the user
     private TokenRequestContext context;
 
+    
+    //TODO: Upon further review from Peter, this should include a Null check in the case that this is the first request
+    //There should be just one constructor as scopes should probably not be optional
     /**
      * Creates an Authentication provider using a passed in TokenCredential
      *

From 8531a5c3f4caa9622dffece9385546fcec74d472 Mon Sep 17 00:00:00 2001
From: ramsessanchez <ramses.sanchez99@gmail.com>
Date: Fri, 14 Aug 2020 01:11:48 -0700
Subject: [PATCH 027/213] update device code flow sample to mirror interactive
 browser sample

---
 .../src/main/java/deviceCodeFlowMain.java     | 28 +++++++++++++++----
 ...ample.java => interactiveBrowserMain.java} |  4 +--
 2 files changed, 24 insertions(+), 8 deletions(-)
 rename samples/interactiveBrowserSample/src/main/java/{interactiveBrowserSample.java => interactiveBrowserMain.java} (97%)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 1025539b4..491d08179 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -4,6 +4,9 @@
 import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.HttpClients;
 import okhttp3.*;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -12,28 +15,41 @@
 
 public class deviceCodeFlowMain {
 
+    //Replace CLIENT_ID with your own client id from an adequately configured app
+    //for requirements visit:
+    //https://github.com/Azure/azure-sdk-for-java/wiki/Set-up-Your-Environment-for-Authentication#enable-applications-for-device-code-flow
+    private final static String CLIENT_ID = "cfb5d84c-c88f-466c-81fb-0fe9fa8da052";
+
+    //Set the scopes for your ms-graph request
+    private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All", "User.Read");
+
     public static void main(String[] args) throws AuthenticationException {
         deviceCodeFlow();
     }
 
     public static void deviceCodeFlow() throws AuthenticationException {
 
-        List<String> scopes = Arrays.asList("user.ReadBasic.All", "User.Read");
-
         DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
-                .clientId("cfb5d84c-c88f-466c-81fb-0fe9fa8da052")
+                .clientId(CLIENT_ID)
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
                 .build();
 
-        TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, scopes);
+        TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, SCOPES);
         OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
 
         Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
 
         httpClient.newCall(request).enqueue(new Callback() {
+            @Override
             public void onResponse(Call call, Response response) throws IOException {
-                String responseBody = response.body().string();
-                System.out.println(responseBody);
+                JSONParser jsonParser = new JSONParser();
+                JSONObject responseJson = null;
+                try {
+                    responseJson = (JSONObject) jsonParser.parse(response.body().string());
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
+                System.out.println(responseJson);
             }
 
             @Override
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
similarity index 97%
rename from samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
rename to samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index 4bf67ad79..d48511413 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserSample.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -12,7 +12,7 @@
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-public class interactiveBrowserSample {
+public class interactiveBrowserMain {
 
     //Replace CLIENT_ID with your own client id from an adequately configured app
     //for requirements visit:
@@ -20,7 +20,7 @@ public class interactiveBrowserSample {
     private final static String CLIENT_ID = "199e4de3-dd3b-4a51-b78a-86b801246e20";
 
     //Set the scopes for your ms-graph request
-    private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All");
+    private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All"); 
 
     public static void main(String args[]) throws Exception {
         interactiveBrowser();

From 5970969087fb7cd986b225e18d1dc04e3c303831 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2020 12:57:49 +0000
Subject: [PATCH 028/213] Bump okhttp from 3.12.1 to 4.8.1

Bumps [okhttp](https://github.com/square/okhttp) from 3.12.1 to 4.8.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.12.1...parent-4.8.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0f161d93f..6a415234c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13'
     
-    api 'com.squareup.okhttp3:okhttp:3.12.1'
+    api 'com.squareup.okhttp3:okhttp:4.8.1'
     
     // https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple
 	compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'

From 69a56e5f4dbf96079e66370f74911ec8039bea8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2020 17:15:06 +0000
Subject: [PATCH 029/213] Bump okhttp from 3.12.1 to 4.8.1

Bumps [okhttp](https://github.com/square/okhttp) from 3.12.1 to 4.8.1.
- [Release notes](https://github.com/square/okhttp/releases)
- [Changelog](https://github.com/square/okhttp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/square/okhttp/compare/parent-3.12.1...parent-4.8.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 22aa4e5b0..ac05d1689 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13'
     
-    api 'com.squareup.okhttp3:okhttp:3.12.1'
+    api 'com.squareup.okhttp3:okhttp:4.8.1'
     
     // https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple
 	compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'

From 4b6b59178ce863734359c539c3ba1ae121b929a4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 24 Aug 2020 13:16:18 -0400
Subject: [PATCH 030/213] - fixes reference to ok http after upgrade

---
 .../com/microsoft/graph/httpcore/AuthenticationHandlerTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index 7f5feba6f..601cb4427 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -27,7 +27,7 @@ public void testAuthenticationHandler() {
 		AuthenticationHandler authHandler = new AuthenticationHandler(authProvider);
 		Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
 		
-		RealInterceptorChain chain = new RealInterceptorChain(null, null, null, null, 0, request, null, null, 0, 0, 0);
+		RealInterceptorChain chain = new RealInterceptorChain(null, null, 0, null, request, 0, 0, 0);
 		
 		try {
 			authHandler.intercept(chain);

From 2a9c6c1b4c7b6f63e3d8ede89a7a8b3234c83838 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 1 Sep 2020 13:40:00 -0400
Subject: [PATCH 031/213] Revert "- reverts upgrade to java8 to avoid
 introducing a breaking change"

This reverts commit 832d55b5a5fe680d885717fca94409f014c1bd04.
---
 build.gradle | 4 ++--
 readme.md    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index ff7a71387..6ddaf7c01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -204,8 +204,8 @@ publishing {
 }
 
 compileJava {
-  sourceCompatibility = 1.7
-  targetCompatibility = 1.7
+  sourceCompatibility = 1.8
+  targetCompatibility = 1.8
 }
 
 def getVersionCode() {
diff --git a/readme.md b/readme.md
index 76cb5137f..eabdee625 100644
--- a/readme.md
+++ b/readme.md
@@ -127,7 +127,7 @@ The Microsoft Graph SDK is open for contribution. To contribute to this project,
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!
 
 ## 6. Supported Java versions
-The Microsoft Graph SDK for Java library is supported at runtime for Java 7+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater.
+The Microsoft Graph SDK for Java library is supported at runtime for Java 8+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater through [desugaring](https://developer.android.com/studio/write/java8-support.html#library-desugaring).
 
 ## 7. License
 

From 9b2efeb0b43f8b9a299ee28110159b45f0123694 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 5 Oct 2020 15:36:45 -0400
Subject: [PATCH 032/213] - aligns ok http version on service sdk

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7a9782ddc..a5ed4ae04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13'
     
-    api 'com.squareup.okhttp3:okhttp:4.8.1'
+    api 'com.squareup.okhttp3:okhttp:4.9.0'
     
     implementation 'com.google.code.gson:gson:2.8.6'
 }

From 44ead255cf184f21d9f70c6c7335ec1542e997e5 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:22:26 -0500
Subject: [PATCH 033/213] - adds android project structure

---
 android/.gitignore                            |   2 +
 android/AndroidManifest.xml                   |  24 +++
 android/build.gradle                          |  71 +++++++
 android/gradle.properties                     |  44 +++++
 android/gradle/wrapper/gradle-wrapper.jar     | Bin 0 -> 59203 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 android/gradlew                               | 185 ++++++++++++++++++
 android/gradlew.bat                           |  89 +++++++++
 android/settings.gradle                       |  10 +
 9 files changed, 430 insertions(+)
 create mode 100644 android/.gitignore
 create mode 100644 android/AndroidManifest.xml
 create mode 100644 android/build.gradle
 create mode 100644 android/gradle.properties
 create mode 100644 android/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 android/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 android/gradlew
 create mode 100644 android/gradlew.bat
 create mode 100644 android/settings.gradle

diff --git a/android/.gitignore b/android/.gitignore
new file mode 100644
index 000000000..f06dfad69
--- /dev/null
+++ b/android/.gitignore
@@ -0,0 +1,2 @@
+.gradle
+build
\ No newline at end of file
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
new file mode 100644
index 000000000..da53f5433
--- /dev/null
+++ b/android/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.microsoft.graph"
+    android:installLocation="auto"
+    tools:ignore="UnusedAttribute">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <supports-screens
+        android:anyDensity="true"
+        android:largeScreens="true"
+        android:normalScreens="true"
+        android:smallScreens="true"
+        android:xlargeScreens="true" />
+
+    <application
+        android:hardwareAccelerated="true"
+        android:fullBackupContent="true"
+        android:allowBackup="true"
+        android:supportsRtl="true"
+        tools:ignore="GoogleAppIndexingWarning"></application>
+</manifest>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 000000000..5a85a6fce
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,71 @@
+buildscript {
+    repositories {
+        google()
+        gradlePluginPortal()
+		maven {
+			url "https://plugins.gradle.org/m2/"
+		}
+    }
+
+    dependencies {
+        classpath "com.gradle:gradle-enterprise-gradle-plugin:3.5"
+        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
+    }
+}
+
+repositories {
+    google()
+    gradlePluginPortal()
+}
+
+apply plugin: "com.android.library"
+apply plugin: "com.github.ben-manes.versions"
+
+android {
+    compileSdkVersion 29
+
+    defaultConfig {
+        versionCode 1
+        versionName "1.0"
+        minSdkVersion 21
+        targetSdkVersion 29
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    lintOptions {
+        textOutput "stdout"
+        checkAllWarnings true
+        warningsAsErrors true
+        disable "UnusedResources"              // Unused will be removed on release
+        disable "IconExpectedSize"             // Using the material icons provided from Google
+        disable "GoogleAppIndexingApiWarning"  // We might want to index our app later
+        disable "InvalidPackage"               // Butterknife, Okio and Realm
+        disable "ResourceType"                 // Annotation binding
+        disable "GradleDependency"
+        disable "NewerVersionAvailable"
+    }
+	sourceSets {
+		main {
+			java.srcDirs = ['../src/main/java']
+			res.srcDirs = ['../src/main/java']
+			manifest.srcFile 'AndroidManifest.xml'
+		}
+		androidTest {
+			setRoot '../src/test'
+		}
+	}
+}
+
+apply from: "../gradle/dependencies.gradle"
diff --git a/android/gradle.properties b/android/gradle.properties
new file mode 100644
index 000000000..221229e60
--- /dev/null
+++ b/android/gradle.properties
@@ -0,0 +1,44 @@
+# Project-wide Gradle settings.
+
+# IDE users:
+# Settings specified in this file will override any Gradle settings
+# configured through the IDE.
+
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+
+# The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
+## linux requires 10G, OSX requires 11G
+org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g
+org.gradle.parallel=true
+org.gradle.caching=true
+
+mavenGroupId         = com.microsoft.graph
+mavenArtifactId      = microsoft-graph-core
+mavenMajorVersion    = 2
+mavenMinorVersion    = 3
+mavenPatchVersion    = 1
+mavenArtifactSuffix = 
+nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
+
+#These values are used to run functional tests
+#If you wish to run the functional tests, edit the gradle.properties
+#file in your user directory instead of adding them here.
+#ex: C:\Users\username\.gradle\gradle.properties
+ClientId="CLIENT_ID"
+Username="USERNAME"
+Password="PASSWORD"
+
+#enable mavenCentralPublishingEnabled to publish to maven central
+mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
+mavenCentralPublishingEnabled=false
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f
GIT binary patch
literal 59203
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
E2O(~oYXATM

literal 0
HcmV?d00001

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..be52383ef
--- /dev/null
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/android/gradlew b/android/gradlew
new file mode 100644
index 000000000..4f906e0c8
--- /dev/null
+++ b/android/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/android/gradlew.bat b/android/gradlew.bat
new file mode 100644
index 000000000..107acd32c
--- /dev/null
+++ b/android/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android/settings.gradle b/android/settings.gradle
new file mode 100644
index 000000000..ab8f7824a
--- /dev/null
+++ b/android/settings.gradle
@@ -0,0 +1,10 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * The settings file is used to specify which projects to include in your build.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user manual at https://docs.gradle.org/6.6/userguide/multi_project_builds.html
+ */
+
+rootProject.name = 'msgraph-sdk-java-core'

From b6127e6119f049cfb57f53935703bf2d5d937403 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:23:09 -0500
Subject: [PATCH 034/213] - moves dependencies in dedicated file

---
 build.gradle               | 9 +--------
 gradle/dependencies.gradle | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 gradle/dependencies.gradle

diff --git a/build.gradle b/build.gradle
index 83db05839..ba39414df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,14 +28,7 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    // Use JUnit test framework
-    testImplementation 'junit:junit:4.13'
-    
-    api 'com.squareup.okhttp3:okhttp:4.9.0'
-    
-    implementation 'com.google.code.gson:gson:2.8.6'
-}
+apply from: "gradle/dependencies.gradle"
 
 def pomConfig = {
     licenses {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
new file mode 100644
index 000000000..23d4bb245
--- /dev/null
+++ b/gradle/dependencies.gradle
@@ -0,0 +1,8 @@
+dependencies {
+    // Use JUnit test framework
+    testImplementation 'junit:junit:4.13'
+    
+    api 'com.squareup.okhttp3:okhttp:4.9.0'
+    
+    implementation 'com.google.code.gson:gson:2.8.6'
+}
\ No newline at end of file

From b67b642c17fa06e1d5a6e59d3f6e969492ee9c17 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:23:29 -0500
Subject: [PATCH 035/213] - adds linting pipeline

---
 .github/workflows/api-level-lint.yml | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/workflows/api-level-lint.yml

diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
new file mode 100644
index 000000000..0fdc26e4a
--- /dev/null
+++ b/.github/workflows/api-level-lint.yml
@@ -0,0 +1,29 @@
+name: "Checks the SDK only using APIs from the targeted API level"
+
+on: 
+  push:
+    branches:
+      - dev
+      - master
+  pull_request:
+    branches:
+      - dev
+      - master
+
+jobs:
+  lint-api-level:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 15
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+      - name: Add execution right to the script
+        run: chmod +x gradlew
+        working-directory: ./android
+      - name: Build SDK with Android project configuration
+        run: ./gradlew --no-daemon build
+        working-directory: ./android
+

From 5e2bb8d8643484904877dbc6827f2a7e33344986 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:23:40 -0500
Subject: [PATCH 036/213] - upgrades wrapper

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6c9a22477..be52383ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 6d96e5f72181ae86a2c4ec7e31db0bb1d50281db Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:28:39 -0500
Subject: [PATCH 037/213] - temporary CI configuration for v2 branch

---
 .github/workflows/api-level-lint.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
index 0fdc26e4a..35e152216 100644
--- a/.github/workflows/api-level-lint.yml
+++ b/.github/workflows/api-level-lint.yml
@@ -9,6 +9,7 @@ on:
     branches:
       - dev
       - master
+      - feature/v2
 
 jobs:
   lint-api-level:
@@ -26,4 +27,3 @@ jobs:
       - name: Build SDK with Android project configuration
         run: ./gradlew --no-daemon build
         working-directory: ./android
-

From 1e6431d1d2c5e15c44bdde99ea10b3991e01eaab Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:42:56 -0500
Subject: [PATCH 038/213] - adds report upload in case of failure

---
 .github/workflows/api-level-lint.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/api-level-lint.yml b/.github/workflows/api-level-lint.yml
index 35e152216..b576a559c 100644
--- a/.github/workflows/api-level-lint.yml
+++ b/.github/workflows/api-level-lint.yml
@@ -25,5 +25,13 @@ jobs:
         run: chmod +x gradlew
         working-directory: ./android
       - name: Build SDK with Android project configuration
+        id: lint
         run: ./gradlew --no-daemon build
         working-directory: ./android
+      - name: Upload linting results
+        if: failure() && steps.lint.outcome == 'failure'
+        uses: actions/upload-artifact@v2
+        with:
+          name: lint-report
+          path: ./android/build/reports
+      

From 1722c48f8a5fef8786151cb176aac5699b8ea703 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 15:43:36 -0500
Subject: [PATCH 039/213] - upgrades to latest sdk version

---
 android/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 5a85a6fce..0156e989f 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -24,13 +24,13 @@ apply plugin: "com.android.library"
 apply plugin: "com.github.ben-manes.versions"
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         versionCode 1
         versionName "1.0"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 30
     }
 
     buildTypes {

From 728478ec48f200caecf4e69cf34fafe6df06770c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 16:10:50 -0500
Subject: [PATCH 040/213] - fixes missing nonnull nullable annotations

---
 .../graph/content/MSBatchRequestContent.java        | 13 +++++++++----
 .../microsoft/graph/content/MSBatchRequestStep.java |  8 +++++++-
 .../graph/content/MSBatchResponseContent.java       | 13 ++++++++++---
 .../graph/httpcore/AuthenticationHandler.java       |  8 ++++++--
 .../microsoft/graph/httpcore/ChaosHttpHandler.java  |  6 +++++-
 .../com/microsoft/graph/httpcore/HttpClients.java   |  9 +++++++--
 .../graph/httpcore/ICoreAuthenticationProvider.java |  5 ++++-
 .../microsoft/graph/httpcore/RedirectHandler.java   |  8 ++++++--
 .../com/microsoft/graph/httpcore/RetryHandler.java  |  8 ++++++--
 .../microsoft/graph/httpcore/TelemetryHandler.java  |  6 +++++-
 .../httpcore/middlewareoption/IShouldRedirect.java  |  4 +++-
 .../httpcore/middlewareoption/IShouldRetry.java     |  4 +++-
 .../httpcore/middlewareoption/RedirectOptions.java  |  6 +++++-
 .../httpcore/middlewareoption/RetryOptions.java     |  6 +++++-
 .../httpcore/middlewareoption/TelemetryOptions.java |  6 +++++-
 15 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index 64eed6c23..6d0c6034a 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -7,6 +7,9 @@
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -30,7 +33,7 @@ public class MSBatchRequestContent {
 	 * 
 	 * @param batchRequestStepsArray List of batch steps for batching
 	 */
-	public MSBatchRequestContent(final List<MSBatchRequestStep> batchRequestStepsArray) {
+	public MSBatchRequestContent(@Nonnull final List<MSBatchRequestStep> batchRequestStepsArray) {
 		if (batchRequestStepsArray.size() > MAX_NUMBER_OF_REQUESTS)
 			throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
 
@@ -52,7 +55,7 @@ public MSBatchRequestContent() {
 	 * @return true or false based on addition or no addition of batch request step
 	 * given
 	 */
-	public boolean addBatchRequestStep(final MSBatchRequestStep batchRequestStep) {
+	public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchRequestStep) {
 		if (batchRequestStepsHashMap.containsKey(batchRequestStep.getRequestId()) ||
 			batchRequestStepsHashMap.size() >= MAX_NUMBER_OF_REQUESTS)
 			return false;
@@ -66,7 +69,8 @@ public boolean addBatchRequestStep(final MSBatchRequestStep batchRequestStep) {
 	 * @param arrayOfDependsOnIds ids of steps this step depends on
 	 * @return the step id
 	 */
-	public String addBatchRequestStep(final Request request, final String... arrayOfDependsOnIds) {
+	@Nonnull
+	public String addBatchRequestStep(@Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
 		String requestId;
 		do {
 			requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
@@ -83,7 +87,7 @@ public String addBatchRequestStep(final Request request, final String... arrayOf
 	 * @return true or false based on removal or no removal of batch request step
 	 * with given id
 	 */
-	public boolean removeBatchRequestStepWithId(final String requestId) {
+	public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
 		boolean removed = false;
 		if (batchRequestStepsHashMap.containsKey(requestId)) {
 			batchRequestStepsHashMap.remove(requestId);
@@ -101,6 +105,7 @@ public boolean removeBatchRequestStepWithId(final String requestId) {
 	/*
 	 * @return Batch request content's json as String
 	 */
+	@Nonnull
 	public String getBatchRequestContent() {
 		final JsonObject batchRequestContentMap = new JsonObject();
 		final JsonArray batchContentArray = new JsonArray();
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
index ac13bb0ab..509701db2 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import okhttp3.Request;
 
 public class MSBatchRequestStep {
@@ -9,7 +12,7 @@ public class MSBatchRequestStep {
 	private Request request;
 	private List<String> arrayOfDependsOnIds;
 	
-	public MSBatchRequestStep(String requestId, Request request, List<String> arrayOfDependsOnIds) {
+	public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final List<String> arrayOfDependsOnIds) {
 		if(requestId == null)
 			throw new IllegalArgumentException("Request Id cannot be null.");
 		if(requestId.length() == 0)
@@ -22,14 +25,17 @@ public MSBatchRequestStep(String requestId, Request request, List<String> arrayO
 		this.arrayOfDependsOnIds = arrayOfDependsOnIds;
 	}
 	
+	@Nonnull
 	public String getRequestId() {
 		return requestId;
 	}
 	
+	@Nonnull
 	public Request getRequest() {
 		return request;
 	}
 	
+	@Nullable
 	public List<String> getArrayOfDependsOnIds(){
 		return arrayOfDependsOnIds;
 	}
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index ca40384e9..58c1011e7 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -5,6 +5,9 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -28,7 +31,7 @@ public class MSBatchResponseContent {
 	/*
 	 * @param batchResponse OkHttp batch response on execution of batch requests
 	 */
-	public MSBatchResponseContent(final Response batchResponse) {
+	public MSBatchResponseContent(@Nullable final Response batchResponse) {
 		this.batchResponse = batchResponse;
 		update(batchResponse);
 	}
@@ -40,7 +43,8 @@ public MSBatchResponseContent(final Response batchResponse) {
 	 * 
 	 * @return OkHttp Response corresponding to requestId
 	 */
-	public Response getResponseById(final String requestId) {
+	@Nullable
+	public Response getResponseById(@Nonnull final String requestId) {
 		if (batchResponseArray == null)
 			return null;
 
@@ -106,6 +110,7 @@ public Response getResponseById(final String requestId) {
 	 * 
 	 * @return responses in Map of id and response
 	 */
+	@Nonnull
 	public Map<String, Response> getResponses() {
 		if (batchResponseArray == null)
 			return null;
@@ -121,12 +126,13 @@ public Map<String, Response> getResponses() {
 	 * 
 	 * @return iterator for responses
 	 */
+	@Nullable
 	public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
 		final Map<String, Response> responsesMap = getResponses();
 		return responsesMap != null ? responsesMap.entrySet().iterator() : null;
 	}
 
-	public void update(final Response batchResponse) {
+	public void update(@Nonnull final Response batchResponse) {
 		if (batchResponse == null)
 			throw new IllegalArgumentException("Batch Response cannot be null");
 
@@ -166,6 +172,7 @@ public void update(final Response batchResponse) {
 	/*
 	 * @return nextLink of batch response
 	 */
+	@Nullable
 	public String nextLink() {
 		return nextLink;
 	}
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index b48b8b337..f5230ac94 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
 
@@ -15,12 +18,13 @@ public class AuthenticationHandler implements Interceptor {
 
 	private ICoreAuthenticationProvider authProvider;
 	
-	public AuthenticationHandler(ICoreAuthenticationProvider authProvider) {
+	public AuthenticationHandler(@Nonnull final ICoreAuthenticationProvider authProvider) {
 		this.authProvider = authProvider;
 	}
 
 	@Override
-	public Response intercept(Chain chain) throws IOException {
+	@Nullable
+	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request originalRequest = chain.request();
 		
 		if(originalRequest.tag(TelemetryOptions.class) == null)
diff --git a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
index 69601d187..d056abb77 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
@@ -3,6 +3,9 @@
 import java.io.IOException;
 import java.util.concurrent.ThreadLocalRandom;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
 
@@ -38,7 +41,8 @@ public class ChaosHttpHandler implements Interceptor {
 	public static final int MSClientErrorCodeTooManyRequests = 429;
 	
 	@Override
-	public Response intercept(Chain chain) throws IOException {
+	@Nullable
+	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
 		
 		if(request.tag(TelemetryOptions.class) == null)
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index e6bea9a00..bdb8c7dda 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -2,6 +2,9 @@
 
 import java.util.Arrays;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
@@ -32,7 +35,8 @@ public static Builder custom() {
      * @param auth Use IAuthenticationProvider instance provided while constructing http client
      * @return OkHttpClient build with authentication provider given, default redirect and default retry handlers 
      */
-    public static OkHttpClient createDefault(ICoreAuthenticationProvider auth) {
+    @Nonnull
+    public static OkHttpClient createDefault(@Nonnull final ICoreAuthenticationProvider auth) {
         return custom()
                 .addInterceptor(new AuthenticationHandler(auth))
     			.addInterceptor(new RetryHandler())
@@ -46,7 +50,8 @@ public static OkHttpClient createDefault(ICoreAuthenticationProvider auth) {
      * @param interceptors Use interceptors provided while constructing http client
      * @return OkHttpClient build with interceptors provided 
      */
-    public static OkHttpClient createFromInterceptors(Interceptor[] interceptors) {
+    @Nonnull
+    public static OkHttpClient createFromInterceptors(@Nullable final Interceptor[] interceptors) {
     	OkHttpClient.Builder builder = custom();
     	if(interceptors != null)
     		for(Interceptor interceptor : interceptors) {
diff --git a/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
index 1ca39a432..be9afbe0e 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
@@ -2,6 +2,8 @@
 
 import okhttp3.Request;
 
+import javax.annotation.Nonnull;
+
 public interface ICoreAuthenticationProvider {
     /**
      * Authenticates the request
@@ -9,5 +11,6 @@ public interface ICoreAuthenticationProvider {
      * @param request the request to authenticate
      * @return Request with Authorization header added to it
      */
-    Request authenticateRequest(Request request);
+    @Nonnull
+    Request authenticateRequest(@Nonnull final Request request);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
index b04d774c7..b3d88ee7d 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
@@ -9,6 +9,9 @@
 import java.io.IOException;
 import java.net.ProtocolException;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
 import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
@@ -34,7 +37,7 @@ public RedirectHandler() {
 	/*
 	 * @param redirectOptions pass instance of redirect options to be used
 	 */
-	public RedirectHandler(RedirectOptions redirectOptions) {
+	public RedirectHandler(@Nullable final RedirectOptions redirectOptions) {
 		this.mRedirectOptions = redirectOptions;
 		if(redirectOptions == null) {
 			this.mRedirectOptions = new RedirectOptions();
@@ -105,7 +108,8 @@ Request getRedirect(
 
     // Intercept request and response made to network
 	@Override
-	public Response intercept(Chain chain) throws IOException {
+	@Nullable
+	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
 		
 		if(request.tag(TelemetryOptions.class) == null)
diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index 9478060e6..8d156183e 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
 import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
@@ -36,7 +39,7 @@ public class RetryHandler implements Interceptor{
     /*
      * @retryOption Create Retry handler using retry option
      */
-    public RetryHandler(RetryOptions retryOption) {
+    public RetryHandler(@Nullable final RetryOptions retryOption) {
         this.mRetryOption = retryOption;
         if(this.mRetryOption == null) {
         	this.mRetryOption = new RetryOptions();
@@ -130,7 +133,8 @@ boolean isBuffered(Response response, Request request) {
 	}
 
 	@Override
-	public Response intercept(Chain chain) throws IOException {
+	@Nullable
+	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
 		
 		if(request.tag(TelemetryOptions.class) == null)
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
index 51d3569c5..129618644 100644
--- a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -2,6 +2,9 @@
 
 import java.io.IOException;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
 
 import okhttp3.Interceptor;
@@ -17,7 +20,8 @@ public class TelemetryHandler implements Interceptor{
 	public static final String CLIENT_REQUEST_ID = "client-request-id";
 
 	@Override
-	public Response intercept(Chain chain) throws IOException {
+	@Nullable
+	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
 		Request.Builder telemetryAddedBuilder = request.newBuilder();
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
index 8ca9cd545..dab75623b 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
@@ -1,7 +1,9 @@
 package com.microsoft.graph.httpcore.middlewareoption;
 
+import javax.annotation.Nonnull;
+
 import okhttp3.Response;
 
 public interface IShouldRedirect {
-	boolean shouldRedirect(final Response response);
+	boolean shouldRedirect(@Nonnull final Response response);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
index 249a5ba3e..90ab05284 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
@@ -3,6 +3,8 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
+import javax.annotation.Nonnull;
+
 public interface IShouldRetry {
-	boolean shouldRetry(long delay, int executionCount, Request request,Response response);
+	boolean shouldRetry(long delay, int executionCount, @Nonnull final Request request, @Nonnull final Response response);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
index f4ef54900..0444db9f3 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
@@ -2,6 +2,9 @@
 
 import okhttp3.Response;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 public class RedirectOptions implements IMiddlewareControl{
 	private int maxRedirects;
 	public static final int DEFAULT_MAX_REDIRECTS = 5;
@@ -26,7 +29,7 @@ public RedirectOptions() {
 	 * @param maxRedirects Max redirects to occur
 	 * @param shouldRedirect Should redirect callback called before every redirect
 	 */
-	public RedirectOptions(int maxRedirects, IShouldRedirect shouldRedirect) {
+	public RedirectOptions(int maxRedirects, @Nullable final IShouldRedirect shouldRedirect) {
 		if(maxRedirects < 0)
 			throw new IllegalArgumentException("Max redirects cannot be negative");
 		if(maxRedirects > MAX_REDIRECTS)
@@ -46,6 +49,7 @@ public int maxRedirects() {
 	/*
 	 * @return should redirect
 	 */
+	@Nonnull
 	public IShouldRedirect shouldRedirect() {
 		return this.shouldRedirect;
 	}
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
index 9010122f5..a254ca889 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
@@ -3,6 +3,9 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
 public class RetryOptions implements IMiddlewareControl {
 	private IShouldRetry mShouldretry;
 	public static final IShouldRetry DEFAULT_SHOULD_RETRY = new IShouldRetry() {
@@ -35,7 +38,7 @@ public RetryOptions(){
 	 * @param maxRetries Number of max retires for a request
 	 * @param delay Delay in seconds between retries
 	 */
-	public RetryOptions(IShouldRetry shouldRetry, int maxRetries, long delay) {
+	public RetryOptions(@Nullable final IShouldRetry shouldRetry, int maxRetries, long delay) {
 		if(delay > MAX_DELAY)
 			throw new IllegalArgumentException("Delay cannot exceed " + MAX_DELAY);
 		if(delay < 0)
@@ -53,6 +56,7 @@ public RetryOptions(IShouldRetry shouldRetry, int maxRetries, long delay) {
 	/*
 	 * @return should retry callback
 	 */
+	@Nonnull
 	public IShouldRetry shouldRetry() {
 		return mShouldretry;
 	}
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
index 60def57d8..6ede38f6d 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
@@ -2,6 +2,8 @@
 
 import java.util.UUID;
 
+import javax.annotation.Nonnull;
+
 public class TelemetryOptions {
 
 	public static final int NONE_FLAG = 0;
@@ -18,14 +20,16 @@ public void setFeatureUsage(int flag) {
 		featureUsage = featureUsage | flag;
 	}
 
+	@Nonnull
 	public String getFeatureUsage() {
 		return Integer.toHexString(featureUsage);
 	}
 
-	public void setClientRequestId(String clientRequestId) {
+	public void setClientRequestId(@Nonnull final String clientRequestId) {
 		this.clientRequestId = clientRequestId;
 	}
 
+	@Nonnull
 	public String getClientRequestId() {
 		if(clientRequestId == null) {
 			clientRequestId = UUID.randomUUID().toString();

From b3e7624fee0d2654da59a8c88b29a7ff2b7d12f0 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 16:11:08 -0500
Subject: [PATCH 041/213] - adds JSR305 dependency

---
 gradle/dependencies.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 23d4bb245..a278b65a9 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -3,6 +3,8 @@ dependencies {
     testImplementation 'junit:junit:4.13'
     
     api 'com.squareup.okhttp3:okhttp:4.9.0'
+
+    api 'com.google.code.findbugs:jsr305:3.0.2' // can be replaced by guava if we need guava
     
     implementation 'com.google.code.gson:gson:2.8.6'
 }
\ No newline at end of file

From 26ed3252d88fc727a543a4e987d553d2e55a77a7 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 16:20:27 -0500
Subject: [PATCH 042/213] - suppresses lambda warning

---
 .../microsoft/graph/httpcore/middlewareoption/RetryOptions.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
index a254ca889..69ad5db26 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
@@ -38,6 +38,7 @@ public RetryOptions(){
 	 * @param maxRetries Number of max retires for a request
 	 * @param delay Delay in seconds between retries
 	 */
+	@SuppressWarnings("LambdaLast")
 	public RetryOptions(@Nullable final IShouldRetry shouldRetry, int maxRetries, long delay) {
 		if(delay > MAX_DELAY)
 			throw new IllegalArgumentException("Delay cannot exceed " + MAX_DELAY);

From 7a7a5072bfa610ba9fcce506fc79209d1820b6f6 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 16:20:41 -0500
Subject: [PATCH 043/213] - adds missing nonnull annotation

---
 src/main/java/com/microsoft/graph/httpcore/HttpClients.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index bdb8c7dda..d1e92aa47 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -21,6 +21,7 @@ private HttpClients() {
      * 
      * @return OkHttpClient.Builder() custom builder for developer to add its own interceptors to it
      */
+    @Nonnull
     public static Builder custom() {
         return new OkHttpClient.Builder()
                     .addInterceptor(new TelemetryHandler())

From 5a31e11ed257defe184af0d3fbdb3cea58ed0b24 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 16 Nov 2020 16:21:07 -0500
Subject: [PATCH 044/213] - fixes compliance issue with java bean spec

---
 .../java/com/microsoft/graph/httpcore/TelemetryHandler.java | 2 +-
 .../graph/httpcore/middlewareoption/TelemetryOptions.java   | 6 +++++-
 .../com/microsoft/graph/httpcore/TelemetryOptionsTest.java  | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
index 129618644..e10675ce1 100644
--- a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -29,7 +29,7 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
 		if(telemetryOptions == null)
 			telemetryOptions = new TelemetryOptions();
 
-		String featureUsage = "(featureUsage=" + telemetryOptions.getFeatureUsage() + ")";
+		String featureUsage = "(featureUsage=" + telemetryOptions.getSerializedFeatureUsage() + ")";
 		String javaVersion = System.getProperty("java.version");
 		String sdkversion_value = GRAPH_VERSION_PREFIX + "/" + VERSION + " " + featureUsage + " " + JAVA_VERSION_PREFIX + "/" + javaVersion;
 		telemetryAddedBuilder.addHeader(SDK_VERSION, sdkversion_value);
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
index 6ede38f6d..415fe509c 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
@@ -20,8 +20,12 @@ public void setFeatureUsage(int flag) {
 		featureUsage = featureUsage | flag;
 	}
 
+	public int getFeatureUsage() {
+		return featureUsage;
+	}
+
 	@Nonnull
-	public String getFeatureUsage() {
+	public String getSerializedFeatureUsage() {
 		return Integer.toHexString(featureUsage);
 	}
 
diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
index dece2ef55..9ba6eedb9 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
@@ -21,16 +21,16 @@ public void setFeatureUsageTest() {
 		TelemetryOptions telemetryOptions = new TelemetryOptions();
 		telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 		telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
-		assertTrue(telemetryOptions.getFeatureUsage().compareTo("5")==0);
+		assertTrue(telemetryOptions.getSerializedFeatureUsage().compareTo("5")==0);
 	}
 
 	@Test
-	public void getFeatureUsageTest() {
+	public void getSerializedFeatureUsageTest() {
 		TelemetryOptions telemetryOptions = new TelemetryOptions();
 		telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 		telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
 		telemetryOptions.setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
-		assertTrue(telemetryOptions.getFeatureUsage().compareTo("7")==0);
+		assertTrue(telemetryOptions.getSerializedFeatureUsage().compareTo("7")==0);
 	}
 
 	@Test

From 2799045e494c99973a3c95541d664d4034ea46d2 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 17 Nov 2020 13:13:55 -0500
Subject: [PATCH 045/213] - updates documented API level

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 5dacfe52a..97b5c600e 100644
--- a/readme.md
+++ b/readme.md
@@ -120,7 +120,7 @@ The Microsoft Graph SDK is open for contribution. To contribute to this project,
 
 ## 6. Supported Java versions
 
-The Microsoft Graph SDK for Java library is supported at runtime for Java 8+ and [Android API revision 15](http://source.android.com/source/build-numbers.html) and greater through [desugaring](https://developer.android.com/studio/write/java8-support.html#library-desugaring).
+The Microsoft Graph SDK for Java library is supported at runtime for Java 8+ and [Android API revision 21](http://source.android.com/source/build-numbers.html) and greater.
 
 ## 7. License
 

From c66009e22a72d03a0c81ea1347f4d75b5400407c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 25 Nov 2020 15:57:03 -0500
Subject: [PATCH 046/213] - adds missing dependency following merge

---
 gradle/dependencies.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 0a0efc0c9..5c1673ae2 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,6 +1,7 @@
 dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.mockito:mockito-core:3.6.0'
     
     api 'com.squareup.okhttp3:okhttp:4.9.0'
 

From c0ede5b6d9b761764bcaadc8ef4c22288904feda Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:13:29 -0500
Subject: [PATCH 047/213] - adds missing nullable nonnull annotations

---
 .../authentication/IAuthenticationProvider.java  |  4 +++-
 .../TokenCredentialAuthProvider.java             | 11 +++++++----
 .../exceptions/AuthenticationException.java      | 13 ++++++++++---
 .../com/microsoft/graph/exceptions/Error.java    | 16 ++++++++++++----
 .../graph/exceptions/ErrorConstants.java         | 11 ++++++++---
 .../microsoft/graph/httpcore/IHttpRequest.java   | 15 ++++++++++++---
 .../microsoft/graph/options/HeaderOption.java    |  4 +++-
 .../java/com/microsoft/graph/options/Option.java |  6 +++++-
 8 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index 08dfcb3e0..a23446ffc 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -1,5 +1,7 @@
 package com.microsoft.graph.authentication;
 
+import javax.annotation.Nonnull;
+
 import com.microsoft.graph.httpcore.IHttpRequest;
 
 public interface IAuthenticationProvider {
@@ -9,6 +11,6 @@ public interface IAuthenticationProvider {
      *
      * @param request the request to authenticate
      */
-    void authenticateRequest(final IHttpRequest request);
+    void authenticateRequest(@Nonnull final IHttpRequest request);
 
 }
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 1527547f8..68418d380 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -11,6 +11,8 @@
 
 import java.util.List;
 
+import javax.annotation.Nonnull;
+
 public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
 
     //TokenCredential expected from user
@@ -27,7 +29,7 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
-    public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws AuthenticationException {
+    public  TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
         if(tokenCredential == null) {
             throw new AuthenticationException(new Error(Codes.InvalidArgument,
                     String.format(Messages.NullParameter, "TokenCredential"))
@@ -45,7 +47,7 @@ public  TokenCredentialAuthProvider(TokenCredential tokenCredential) throws Auth
      * @param scopes Specified desired scopes of the Auth Provider
      * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
-    public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String> scopes) throws AuthenticationException {
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
         this(tokenCredential);
         this.context.setScopes(scopes);
     }
@@ -56,7 +58,7 @@ public TokenCredentialAuthProvider(TokenCredential tokenCredential, List<String>
      * @param request the request to authenticate
      */
     @Override
-    public void authenticateRequest(IHttpRequest request) {
+    public void authenticateRequest(@Nonnull final IHttpRequest request) {
         request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
     }
 
@@ -67,7 +69,8 @@ public void authenticateRequest(IHttpRequest request) {
      * @return Request with Authorization header added to it
      */
     @Override
-    public Request authenticateRequest(Request request) {
+    @Nonnull
+    public Request authenticateRequest(@Nonnull final Request request) {
         return request.newBuilder()
                     .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
                     .build();
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
index 7807f0e22..f5ccb9865 100644
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -1,8 +1,15 @@
 package com.microsoft.graph.exceptions;
 
+import javax.annotation.Nonnull;
+
 public class AuthenticationException extends Exception{
 
-    //Error object to store details of thrown Exception
+    /**
+     * serial id
+     */
+    private static final long serialVersionUID = 8708883112518988965L;
+    // Error object to store details of thrown Exception
+    @Nonnull
     public Error error;
 
     /**
@@ -10,7 +17,7 @@ public class AuthenticationException extends Exception{
      *
      * @param error The specifying error causing exception to be thrown
      */
-    public AuthenticationException(Error error) {
+    public AuthenticationException(@Nonnull final Error error) {
         super(error.getMessage());
         this.error = error;
     }
@@ -21,7 +28,7 @@ public AuthenticationException(Error error) {
      * @param error The specified error causing exception to be thrown
      * @param rootCause The underlying exception causing AuthenticationException to be thrown
      */
-    public AuthenticationException(Error error, Throwable rootCause) {
+    public AuthenticationException(@Nonnull final Error error, @Nonnull final Throwable rootCause) {
         super(error.getMessage(), rootCause);
         this.error = error;
     }
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
index 03d9596d1..4dcaea94a 100644
--- a/src/main/java/com/microsoft/graph/exceptions/Error.java
+++ b/src/main/java/com/microsoft/graph/exceptions/Error.java
@@ -1,10 +1,15 @@
 package com.microsoft.graph.exceptions;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 public class Error {
 
     //Error Code specifying error type
+    @Nullable
     public String Code;
     //Error Message describing error
+    @Nonnull
     public String Message;
 
     /**
@@ -13,7 +18,7 @@ public class Error {
      * @param code The specified error code
      * @param message The specified error message
      */
-    public Error(String code, String message) {
+    public Error(@Nonnull final String code, @Nonnull final String message) {
         this.Code = code;
         this.Message = message;
     }
@@ -23,7 +28,7 @@ public Error(String code, String message) {
      *
      * @param message The specified error message
      */
-    public Error(String message)
+    public Error(@Nonnull final String message)
     {
         this.Message = message;
     }
@@ -33,6 +38,7 @@ public Error(String message)
      *
      * @return the error message
      */
+    @Nonnull
     public String getMessage(){return this.Message;}
 
     /**
@@ -40,6 +46,7 @@ public Error(String message)
      *
      * @return the error code
      */
+    @Nullable
     public String getCode(){return this.Code;}
 
     /**
@@ -47,20 +54,21 @@ public Error(String message)
      *
      * @param message the error message
      */
-    public void setMessage(String message){ this.Message = message; }
+    public void setMessage(@Nonnull final String message){ this.Message = message; }
 
     /**
      * Set the error code
      *
      * @param code the error code
      */
-    public void setCode(String code) { this.Code = code; }
+    public void setCode(@Nonnull final String code) { this.Code = code; }
 
     /**
      * Returns a string with the specified error details
      *
      * @return the error details as a String
      */
+    @Nonnull
     public String toString() {
         StringBuilder errorString = new StringBuilder();
 
diff --git a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
index 23f9ddf92..6951f90b4 100644
--- a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
+++ b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
@@ -1,14 +1,19 @@
 package com.microsoft.graph.exceptions;
 
+import javax.annotation.Nonnull;
+
 public final class ErrorConstants {
 
     public static class Codes {
-        public static String GeneralException = "generalException";
-        public static String InvalidArgument = "invalidArgument";
+        @Nonnull
+        public final static String GeneralException = "generalException";
+        @Nonnull
+        public final static String InvalidArgument = "invalidArgument";
 
     }
 
     public static class Messages {
-        public static String NullParameter = "%s parameter cannot be null.";
+        @Nonnull
+        public final static String NullParameter = "%s parameter cannot be null.";
     }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java b/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
index 44c88134d..b3b48c00c 100644
--- a/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
+++ b/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
@@ -8,6 +8,9 @@
 import java.net.URL;
 import java.util.List;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * An HTTP request
  */
@@ -18,6 +21,7 @@ public interface IHttpRequest {
      *
      * @return the request URL
      */
+    @Nullable
     URL getRequestUrl();
 
     /**
@@ -25,6 +29,7 @@ public interface IHttpRequest {
      *
      * @return the HTTP method
      */
+    @Nullable
     HttpMethod getHttpMethod();
 
     /**
@@ -32,6 +37,7 @@ public interface IHttpRequest {
      *
      * @return the headers
      */
+    @Nullable
     List<HeaderOption> getHeaders();
 
     /**
@@ -39,6 +45,7 @@ public interface IHttpRequest {
      *
      * @return the options
      */
+    @Nullable
     List<Option> getOptions();
 
     /**
@@ -47,7 +54,7 @@ public interface IHttpRequest {
      * @param header the name of the header
      * @param value  the value of the header
      */
-    void addHeader(String header, String value);
+    void addHeader(@Nonnull final String header, @Nonnull final String value);
 
     /**
      * Sets useCaches parameter to cache the response
@@ -82,13 +89,14 @@ public interface IHttpRequest {
      *
      * @param shouldRedirect Callback called before doing a redirect
      */
-    void setShouldRedirect(IShouldRedirect shouldRedirect);
+    void setShouldRedirect(@Nonnull final IShouldRedirect shouldRedirect);
 
     /**
      * Gets the should redirect callback
      *
      * @return Callback which is called before redirect
      */
+    @Nullable
     IShouldRedirect getShouldRedirect();
 
     /**
@@ -96,13 +104,14 @@ public interface IHttpRequest {
      *
      * @param shouldretry The callback called before retry
      */
-    void setShouldRetry(IShouldRetry shouldretry);
+    void setShouldRetry(@Nonnull final IShouldRetry shouldretry);
 
     /**
      * Gets the should retry callback
      *
      * @return Callback called before retry
      */
+    @Nullable
     IShouldRetry getShouldRetry();
 
     /**
diff --git a/src/main/java/com/microsoft/graph/options/HeaderOption.java b/src/main/java/com/microsoft/graph/options/HeaderOption.java
index 0abb8b878..2f21d0084 100644
--- a/src/main/java/com/microsoft/graph/options/HeaderOption.java
+++ b/src/main/java/com/microsoft/graph/options/HeaderOption.java
@@ -1,5 +1,7 @@
 package com.microsoft.graph.options;
 
+import javax.annotation.Nonnull;
+
 /**
  * A header value
  */
@@ -11,7 +13,7 @@ public class HeaderOption extends Option {
      * @param name  the name of the header
      * @param value the value of the header
      */
-    public HeaderOption(final  String name, final String value) {
+    public HeaderOption(@Nonnull final String name, @Nonnull final String value) {
         super(name, value);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
index 36323852f..61a2f4069 100644
--- a/src/main/java/com/microsoft/graph/options/Option.java
+++ b/src/main/java/com/microsoft/graph/options/Option.java
@@ -1,5 +1,7 @@
 package com.microsoft.graph.options;
 
+import javax.annotation.Nonnull;
+
 /**
  * An option that is settable for a request
  */
@@ -21,7 +23,7 @@ public class Option {
      * @param name  the name of the option
      * @param value the value of the option
      */
-    protected Option(final String name, final Object value) {
+    protected Option(@Nonnull final String name, @Nonnull final Object value) {
         this.name = name;
         this.value = value;
     }
@@ -31,6 +33,7 @@ protected Option(final String name, final Object value) {
      *
      * @return the name of the option
      */
+    @Nonnull
     public String getName() {
         return name;
     }
@@ -40,6 +43,7 @@ public String getName() {
      *
      * @return the value of the option
      */
+    @Nonnull
     public Object getValue() {
         return value;
     }

From 9806b5cf407393b284792e93dfa6a1349617251a Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:14:00 -0500
Subject: [PATCH 048/213] - ignores duplicated class warning

---
 android/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/build.gradle b/android/build.gradle
index 0156e989f..763f66b71 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -55,6 +55,7 @@ android {
         disable "ResourceType"                 // Annotation binding
         disable "GradleDependency"
         disable "NewerVersionAvailable"
+        disable "DuplicatePlatformClasses"      // xpp3 added by azure-identity 
     }
 	sourceSets {
 		main {

From d275cbb1c8780bea105dd6c48925230fe0113a0d Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:38:04 -0500
Subject: [PATCH 049/213] Apply suggestions from code review

---
 samples/deviceCodeSample/build.gradle                           | 2 +-
 samples/interactiveBrowserSample/build.gradle                   | 2 +-
 .../src/main/java/interactiveBrowserMain.java                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/deviceCodeSample/build.gradle b/samples/deviceCodeSample/build.gradle
index d22041dd0..ea5dbaf67 100644
--- a/samples/deviceCodeSample/build.gradle
+++ b/samples/deviceCodeSample/build.gradle
@@ -12,5 +12,5 @@ repositories {
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     implementation project(':coreLibrary')
-    implementation 'com.azure:azure-identity:1.0.8'
+    implementation 'com.azure:azure-identity:1.2.0'
 }
diff --git a/samples/interactiveBrowserSample/build.gradle b/samples/interactiveBrowserSample/build.gradle
index d22041dd0..ea5dbaf67 100644
--- a/samples/interactiveBrowserSample/build.gradle
+++ b/samples/interactiveBrowserSample/build.gradle
@@ -12,5 +12,5 @@ repositories {
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
     implementation project(':coreLibrary')
-    implementation 'com.azure:azure-identity:1.0.8'
+    implementation 'com.azure:azure-identity:1.2.0'
 }
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index d48511413..522316340 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -20,7 +20,7 @@ public class interactiveBrowserMain {
     private final static String CLIENT_ID = "199e4de3-dd3b-4a51-b78a-86b801246e20";
 
     //Set the scopes for your ms-graph request
-    private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All"); 
+    private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All"); 
 
     public static void main(String args[]) throws Exception {
         interactiveBrowser();

From b655499928a8586590e479280dbc4ee275297970 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:45:43 -0500
Subject: [PATCH 050/213] - adds missing gitignore files for samples

---
 samples/deviceCodeSample/.gitignore         | 34 +++++++++++++++++++++
 samples/interactiveBrowserSample/.gitignore | 34 +++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 samples/deviceCodeSample/.gitignore
 create mode 100644 samples/interactiveBrowserSample/.gitignore

diff --git a/samples/deviceCodeSample/.gitignore b/samples/deviceCodeSample/.gitignore
new file mode 100644
index 000000000..e34a1d606
--- /dev/null
+++ b/samples/deviceCodeSample/.gitignore
@@ -0,0 +1,34 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/.gradle/
+/build/
+/bin/
+
+#Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+/target/
+local.properties
\ No newline at end of file
diff --git a/samples/interactiveBrowserSample/.gitignore b/samples/interactiveBrowserSample/.gitignore
new file mode 100644
index 000000000..e34a1d606
--- /dev/null
+++ b/samples/interactiveBrowserSample/.gitignore
@@ -0,0 +1,34 @@
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/.gradle/
+/build/
+/bin/
+
+#Eclipse
+.project
+.classpath
+.settings
+
+# Maven
+/target/
+local.properties
\ No newline at end of file

From 7f58fa751e8ad7b5b6e04aab6696f543f5aecd27 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:46:28 -0500
Subject: [PATCH 051/213] - updates wrapper to latest

---
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 samples/deviceCodeSample/gradlew              | 185 ++++++++++++++++++
 samples/deviceCodeSample/gradlew.bat          |  89 +++++++++
 3 files changed, 275 insertions(+), 1 deletion(-)
 create mode 100644 samples/deviceCodeSample/gradlew
 create mode 100644 samples/deviceCodeSample/gradlew.bat

diff --git a/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties b/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties
index a4b442974..be52383ef 100644
--- a/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/deviceCodeSample/gradlew b/samples/deviceCodeSample/gradlew
new file mode 100644
index 000000000..4f906e0c8
--- /dev/null
+++ b/samples/deviceCodeSample/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/samples/deviceCodeSample/gradlew.bat b/samples/deviceCodeSample/gradlew.bat
new file mode 100644
index 000000000..107acd32c
--- /dev/null
+++ b/samples/deviceCodeSample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From ed50c5a56fce576287891aece4f90cd21b3bc30f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:47:02 -0500
Subject: [PATCH 052/213] - updates reference to credential helper as signature
 changed

---
 .../src/main/java/deviceCodeFlowMain.java     | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 491d08179..1f4cd8ae5 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -4,9 +4,6 @@
 import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.HttpClients;
 import okhttp3.*;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -29,27 +26,20 @@ public static void main(String[] args) throws AuthenticationException {
 
     public static void deviceCodeFlow() throws AuthenticationException {
 
-        DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
+        final DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
                 .clientId(CLIENT_ID)
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
                 .build();
 
-        TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, SCOPES);
-        OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
+        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(SCOPES, deviceCodeCred);
+        final OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
 
-        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
+        final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
 
         httpClient.newCall(request).enqueue(new Callback() {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-                JSONParser jsonParser = new JSONParser();
-                JSONObject responseJson = null;
-                try {
-                    responseJson = (JSONObject) jsonParser.parse(response.body().string());
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-                System.out.println(responseJson);
+                System.out.println(response.body().string());
             }
 
             @Override

From 2aba864f0314931852b19533a7ddff069801d9d8 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:50:24 -0500
Subject: [PATCH 053/213] - adds missing wrapper for sample

---
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 0 -> 59203 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 samples/interactiveBrowserSample/gradlew      | 185 ++++++++++++++++++
 samples/interactiveBrowserSample/gradlew.bat  |  89 +++++++++
 4 files changed, 279 insertions(+)
 create mode 100644 samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 samples/interactiveBrowserSample/gradlew
 create mode 100644 samples/interactiveBrowserSample/gradlew.bat

diff --git a/samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.jar b/samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f
GIT binary patch
literal 59203
zcma&O1CT9Y(k9%tZQHhO+qUh#ZQHhO+qmuS+qP|E@9xZO?0h@l{(r>DQ>P;GjjD{w
zH}lENr;dU&FbEU?00aa80D$0M0RRB{U*7-#kbjS|qAG&4l5%47zyJ#WrfA#1$1Ctx
zf&Z_d{GW=lf^w2#qRJ|CvSJUi(^E3iv~=^Z(zH}F)3Z%V3`@+rNB7gT<C4E+e^X1+
z079LInxq~UYf-kNla?M9Qw5`wqM;O{-8tPk0sfaO{=LZmzBQ1)zwMpO|F66HKXsu0
zsblVBXkugf|5Qc(cU5;MLk9;_r~hk73h82L2Ot0dCNKa1{eNB}WN+`{?DBWLtf8fy
zvWuaUi>VU{Bb~90p|f+0(v;nz01EG7yDMX9@S~__vVgv%rS$+?IH+oZ03D5zYrv|^
zC1J)SruYHmCki$jLBlTaE5&dFG9-kq3!^i>^UQL`%gn6)jz54$WDmeYdsBE9;PqZ_
zoGd=P4+|(-u4U1dbAVQrFWoNgNd;0nrghPFbQrJctO>nwDdI`Q^i0XJDUYm|T|RWc
zZ3^Qgo_Qk$%Fvjj-G}1NB#ZJqIkh;kX%V{THPqOyiq)d)0+(r9o(qKlSp*hmK#iIY
zA^)Vr$-Hz<#SF=0@tL@;dCQsm`V9s1vYNq}K1B)!XSK?=I1)tX+bUV52$YQu*<ra!
z!v%7ZiKpO7g;NmE(;dSwu}#Qr14TWb<rzbgaS}{2FVDKaeCbmIt`T?_&=oa1ox)Gi
zqwS3lX?Fkmj%*6-JQ8ia`$(tFUJ#ol59+HHQxhli%Jb#vc@r`6ZP-EsfP2S!rwy#d
z;DP`C{cFdu2M4~`pHtE1KsUc1?BTR?&fOjbQh0|PcMiZgx_Kq$bLD%;`Ig2_LE~#`
zt32~lMNxY>0%fnWEukW>mxkz+%3-S!oguE8u#MGzST8_Dy^#U?fA@S#K$<FiPyhgu
zzq^L^|GyXf(+AWxl#$gjesG=F>S@9msUiX!gd_ow>08w5)nX{-KxqMOo7d?k2&?Vf
z&diGDtZr(0cwPe9z9FAUSD9KC)7(n^lMWuayCfxzy8EZsns%OEblHFSzP=cL6}?J|
z0U$H!4S_<U3#TVDkQ!s%Ox_BnFc2H6iNU0q=!|+Z9mk`Nbw?whndl6tI(Fj=$tl!^
zIOq<7BPlTvwG$fSu#@_%M(FvF2tpewu1-c35x~(IN{;#g5`-28n}V56vUKDyHalgc
zVFs4DD7(uszamXg!+b}p?!s)SZXGtIED*Jww1@^#7%op*kD~rw8S#!ebx(C|Oi-ci
zN~c@b8rVJSYHe*Cyn5uEa+-wenYQT6aAn!pd*%?%r>TVjj<`6dy^2j`V`)mC;cB%*
z8{>_%E1^FH!*{>4a7*C1v>~1*@TMcLK{7nEQ!_igZC}ikJ$*<$yHy>7)oy79A~#xE
zWavoJOIOC$5b6*q*F_qN1>2#MY)AXVyr$6x4b=$x^*aqF*L?vmj>Mgv+|ITnw_BoW
zO?jwHvNy^prH{9$rrik1#fhyU^MpFqF2fYEt(;4`Q&XWOGDH8k6<goGkkqwiLLr*g
z5z6x8$sF`?<e^h`j@COy$E+qY=Oj=v!b*KAnIYc*AP7qC0C#dwjl&srabEh<e-#E9
zv&sl%zw~Grb~0?}V1_A9--Q~b&NxawFDL54EJtT<qO4Z~5p7>M=%@fics4ajI;st#
zCU^r1CK&|jzUhRMv;+W~6N;u<;#DI6cCw-<Kad;hI?@=R3TXw!Cr}=BbI5m+uEl-w
zqErRfdJ>otsc@IsN3MoSD^O`eNflIoR~l4*&-%RBYk@gb^|-JXs&~KuSEmMxB}xSb
z@K76cXD=Y|=I&SNC2E+>Zg?R6E%DGCH5J1nU!A|@eX9oS(WPaMm==k2s_ueCqdZw|
z&hqHp)47`c{BgwgvY2{xz%OIkY1xDwkw!<0veB#yF4ZKJyabhyyVS`gZepcFIk%e2
zTcrmt2@-8`7i-@5Nz>oQWFuMC_KlroCl(PLSodswHqJ3fn<;gxg9=}~3x_L3P`9Sn
zChIf}8vCHvTriz~T2~FamRi?rh?>3bX1j}%bLH+uFX+p&+^aXbOK7clZxdU~6Uxgy
z8R=obwO4dL%pmVo*Ktf=lH6hnl<C=NTH%5`gfxBHGJj`iNz(A#<w&(&isR(NdjRau
zf|I4<<<u=|XXZxd2JFGs>z_5k3cG;m8lgaPp~?eD!Yn2kf)tU6PF{kLyn|oI@eQ`F
z3IF7~Blqg8-uwUuWZScRKn%c2_}dXB6Dx_&xR*n9M9LXasJhtZdr$vBY!rP{c@=)&
z#!?L$2UrkvClwQO>U*fSMs67oSj2mxiJ$t;E|>q%Kh_GzzWWO&3;ufU%2z%ucBU8H
z3WIwr$n)cfCXR&>tyB7BcSInK>=ByZA%;cVEJhcg<#6N{aZC4>K41XF>ZgjG`z_u&
zGY?;Ad?-sgiOnI`oppF1o1Gurqbi*;#x2>+SSV6|1^G@ooVy<y93LDm;wIOTj=5c$
zC-QhzvAl0y_;%{)gWRy`;Bf=?TtTe*SY!MP@9W|edu{l86Kr1<Cmr((Tem3gt4{#y
z3D<WVud@WzG8_>@fg?wyf@0Y!UZ4!}nGuLeC^l)6pwkh|oRY`s1Pm$>zZ3u-83T|9
z<QZfPf@8vDvzJ5u4A^A<#$7q&=f7lp3&n5W!oLxA;ja+?=SVAJ?`~&fZ)ozb9P1k`
z3pL1q5VB*z+Ct?<9|-*itS69vS4hVra5Z!lDKSySn;jjmUpRtte+Bax7QXjI?`90S
zA4?c)l!1W6+}k;06I}~wRC@!%R<xI9L>GaKJIV3_x+u1>cRibsaJpJqhcm%?0-L;2
zitBrdRxNmb0OO2J%Y&Ym(6*`_P3&&5Bw157{o7LFguvxC$4&zTy#U=W*l&(Q2MNO}
zfaUwYm{<Z#B+303&8&j|1AYBZQ1ef~@-GzfzfBY|H8XUzarxJ|f|I?ulc}?_jHR=S
zshz3QKN3ud>XtILD$3864IA_nn34oVa_g^FRuHL5wdUd)+W-p-iWCKe8m_cMHk+=?
zeKX)M?Dt(|{r5t7IenkAXo%&EXIb-i^w+0CX0D=xApC=|Xy(`xy+QG^UyF<x+1@YN
z-ZMAue9y-N{P;V-w=mmGh-1)C76Xu!U?t<}ByuZz$q|bl4S<l@37Jh~Glu1WLl}(l
zthb2~6ne4Q83FI<<Ay4c4`8D(It&am2#(!Ony)app0o62Q+)KCL_LQOA)tF@50mMJ
z<<yYk$({rlv3BkbtJ+SuacOk#dTZz@Qrop4gQ~UO=spb=-piAtn0x3U*bMbJdwI>e
z+#J6h_&T5i#sV)hj3D4WN%z;2+jJcZxcI3*CHXGmOF3^)JD5j&wfX)e?-|V0GPuA+
zQFot%aEqGNJJHn$!_}#PaAvQ^{3-Ye7b}rWwrUmX53(|~i0v{}G_sI9uDch_brX&6
zWl5Ndj-AYg(W9CGfQf<6!YmY>Ey)+uYd<oGrQ)76s0B|$EDBcWW*bGf!XzhAcke;%
zrh(E+RSxuWf~{)Nc=B!JS!X`$2DA4*+k72=D%60mnI%QDRarAyE}--rmK`Z^V+Yae
z&vDIckd3^cYT8wuAh(uIoqyu^LYf=&(`lZI>_J<fvopl!qQMd6Z#ZYajSPWAp}`qN
zjM~mJhn3N452gfOT)3x7am8MT`AA+VSSTZ}v@@8Ef-MrsX1vV|`Qx}Yh}~|pD;qlf
zbIL{96T!~st%_2?)f30K4Wp&xR_;627NS?#a?ONO1)C^TbaxNEe^u!aMYPy7;-Hq3
z8kFD}u19!l+a?p#Hl9<7(I=E6f85Gdi%U@U>NXH=>|`OH-CDCmcH(0%iD_aLlNHKH
z7bcW-^5+QV$jK?R*)wZ>r9t}loM@XN&M-Pw=F#xn(;u3!(3SXXY^@=aoj70;_=QE9
zGghsG3e<X)8z!NOUQ-K7Tg*M~$*Lq1YL~>kq#N||u{4We_25U=y#T*S{4I{++Ku)>
zQ!DZW;pVcn>b;&g2;YE#+V`v*Bl&Y-i@X6D*OpNA{G@JAXho&aOk(_j^weW{#3X5Y
z%$q_wpb07EYPdmyH(1^09i$ca<gJ(BN8tBcV!2)N5jxRqNZX(-f?Oe`25b>{O<}7)
zRWncXdSPgBE%BM#by!E>tdnc$8RwUJg1*x($6$}ae$e9Knj8gvVZe#bLi!<+&BkFj
zg@nOpDneyc+hU9P-;jmOSMN|*H#>^Ez#?;%C3hg_65leSUm;iz)UkW)jX#p)e&S&M
z1|a?wDzV5NVnlhRBCd_;F87wp>6c<&nkgvC+!@KGiIqWY4l}=&1w7|r6{oBN8xyzh
zG$b#2=RJp_iq6)#t5%yLkKx(0@D=C3w+oiXtSuaQ%I1WIb-eiE$d~!)b@|4XLy!CZ
z9p=t=%3ad@Ep+<9003D2KZ5VyP~_n$=;~r&YUg5UZ0KVD&tR1DHy9x)qWtKJp#Kq#
zP*8p#W(8JJ_*h_3W}FlvRam?<4Z+<U)YVE|@-H{P0L;lgD=4M+K83d`J=;XZ6cLXJ
z^Pb^7ai96hX*$t^`}X?;F@T^K^_U|s%%#VBR44vL@CQr;#z>-H77^$Lvi+#vmhL9J
zJ<1SV45xi;SrO2f=-OB(7#iNA5)x1uNC-yNxUw|!00vcW2PufRm>e~<GrW@0xg&;k
zL?iysf{CN}V{o=!B5cYHv{+Y1t=R-R>toH;M0Q85MQLWd?3O{i8H+5VkR@l9Dg-ma
ze2fZ%>G(u5(k9EHj2L6!;(KZ8%8|*-1V|B#EagbF(rc+5iL_5;Eu)L4Z-V;0HfK4d
z*{utLse_rvHZeQ>V5H=f78M3Ntg1BPxFCVD{HbNA6?9*^YIq;B-DJd{Ca2L#)qWP?
zvX^NhFmX?CTWw&Ns}lgs;r3i+Bq@y}Ul+U%pzOS0Fcv9~aB(0!>GT0)NO?p=25LjN
z2bh>6RhgqD7bQj#k-KOm@JLgMa6>%-ok1WpOe<hhSU`7#vu9^7%H57&(`pARdXnZM
z;eION-Jf1cVd1-MCh?1mFC&L}n&D)2PEzUHkSiE_t+j1!E~K#qcYI-`hc5a+<MQay
z<1}>)FS^XOU{c?d5shG(lIn3GiVBxmg`u%-j=)^v&pX1JecJics3&jvPI)mDut52?
z3jEA)DM%}BYbxxKrizVYwq?(P&19EXlwD9^-6J+4!}9{ywR9Gk42jjAURAF&EO|~N
z)?s>$Da@ikI4|^z0e{r`J8zIs>SpM~Vn^{3fArRu;?+43>lD+^XtUcY1HidJwnR6+
z!;oG2=B6Z_=M%*{z-RaHc(n|1RTKQdNjjV!Pn9lFt^4w|AeN06*j}Zyhq<HLE#a+A
zJ{@Y`FHfEI5bv;8o$ZEGCqCOp4`6-5eeTUyKzzSKd~k>Z^!-=cyGP_ShV1rGxkx8t
zB;8`h!S{LD%ot``700d0@Grql(DTt4Awgmi+Yr0@#jbe=2#UkK%rv=OLqF)9D7D1j
z!~McAwMYkeaL$~kI~90)5vBhBzWYc3Cj1WI0RS`z000R8-@ET0dA~*r(gS<U)h`aD
zLE6Dn5Q+3O*c2B9elF29G1VrakVK+eBtDr^Gf}-iF&NZnZ$t<sha>iCJmQMN&4%1D
zyVNf0?}sBH8zNbBLn>~(W{d3%@kL_eQ6jEcR{l><V*L*c8i9aN^J3k5@LC4D{kHc*
ztiPGM*MYdYK5-%KXLXp`;*IAihHn*4Pn*cYN8uZA$oHJE-8(VkYwPa2amx3wu)oxf
z;@K?9yEDA%g1*No{aF{@JJ45(#kW@dSB%B?ig4GNH`G^-kpE2q*E={oZNZKA>C|JK
z(R-fA!z|TTRG40|zv}7E@PqCAXP3n`;%|SCQ|ZS%ym$I{`}t3KPL&^l5`3>yah4*6
zifO#{VNz3)?<E9P2g)v<M^QTEwJXCARf%0EK}z-2B8QN$*7-J-mD@w9d6fzs+FVv4
zrJ6y#^xsh;O&ToHBFf~MC54(~Sb2j}sCotWQt($NS~kJz72WH?<eo8;ekt}!o;CT~
zFlF~#@UZt@DeNAn7u||SULov|N<ot`RP2<Gm?2rbIJ;;m_J~Yu)ZL<c+N#@?_iQO`
zRo%izIfJ9RLf%!Awp2T%_jV~S<vv}L?&aO;G&bt(!h60lS`2vX)v@WhGFXzOtRK;c
zyr@kt8OV3(72@wS&Pz;*6SWo#Z2jYhpl6$h+sV9U!&ep>ZL$be;NEaAk9b#{tV?V7
zP|wf5YA*1;s<)9A4~l3BHzG&HH`1xNr#%){4xZ!jq%o=7nN*wMuXlFV{HaiQLJ`5G
zBhDi#D(m`Q1pLh@Tq+L;OwuC52RdW7b8}~60WCOK5iYMUad9}7aWBuILb({5=z~YF
zt<!zJa=c$qO%0sJrsowK;!t%<S=X7Y&Jxn+nGDY&f(=_-CL}c~4K|D7ux0QbLt&^f
zSr24bBRsz?=*UjQu7gZoZ09|ewuhGV`hI~v^swhOT82+78;Tj2xT>?*Jr<A3W3T-3
z<1&Nz$ui_+E7n$IbPK2Rrimn|(;7EPx1h6Fi)-3?>5NG+WadM{mDL>GyiByCuR)hd
zA=HM?J6l1Xv0Dl+LW@w$OTcEoOda^nFCw*Sy^I@$sSuneMl{4ys)|RY#9&NxW4S)9
zq|%83IpslTLoz~&vTo!Ga@?rj_kw{|k{nv+w&Ku?fyk4Ki4I?);M|5Axm)t+BaE)D
zm(`AQ#k^DWrjbuXoJf2{Aj<e%564WZLSS(Vd#ROb?}iRVX%`%#SRY^TSh{u=kI84e
z3Ow&PB(uhOFrXgEsH|%j)I-Ug(1-{oj6dcgiDH#{Xclz$DM?xphY_S^6Z_M-j<Q{M
z3m5`Vg`@HsKN#jbtysG34Af*<`=E}BAe7{&&983YEEQfM{J8#P!otJO%!Ug4=|diY
zavSVyOcEEa#lU9-1SEeUY5cJ=<Ds##5c*EUsRi@fN(`2}Y5bh+k`b9uFL%rwlbF%M
zdSW_2pP9rtReb`cMyUFd*B2fwpi645^+_wI6EzB|mef<{4KFd8`yOM9scKF$vrUM|
zCoNlGyffVj5PnZZrY&Y5n|uW=PHnHX<YXTSdl@8HE*;J7fEIy#D!|gwR}m6V5SwWq
z(a}Z41Prc!Wk&AE!j3s3VBd*3Lw?gbM3E&oKBI9kltN8F1T6wcC{`?P4s@QUU>^KT
zFb1zMSqxq|vceV+Mf-)$oPflsO$@*A0n0Z!R{&(xh8s}=;t(lIy<Pl3uQSpJ4S8Y>
zv$S8x>m;vQNHuRzoaOo?eiWFe{0;$s`Bc+Osz~}Van${u;g(su`3lJ^TEfo~nERfP
z)?aFzpDgnLYiER<rBlW-W;>sKPu<X=38r|I{0&8J8r0^`tKAAKA8jUsvBhopXc14T
zgUW&TYxF3i;mZl;v5E+2qh>|0tq4l2wT)Atr6Qb%m-AUn6HnCue*yWICp7TjW$@sO
zm5rm4aTcPQ(rfi7a`xP7cKCFrJD}*&_~xgLyr^-bmsL}y;A5P|al8J3WUoBSjqu%v
zxC;mK!g(7r6RRJ852Z~feoC&sD3(6}^5-uLK8o)9{8L_%%rItZK9C){UxB|;G>JbP
zsRRtS4-3B*5c+K2kvmgZK8472%l>3cntWUO<l-B0`McQr%h#X$@@JrQb8#@ppQUG9
z)`zI{d#E;id*aB>VHxB|{Ay~aOg5RN<wtviA9uMGSHMzxbdkCR`SfK34yQ^bEpjN~
zPf^Bz$`=daT8!L25oqT&4i=+dRE^=E#-D#x^n<}e%YqXyp_!ut)H)b@E0UPjTon!Z
zEyxi=e>;{PJgeVD*H%ac+y!h#wi%o2bF2Ca8IyMyH{>4#{E_8u^@+l-+n=V}Sq?$O
z{091@v%Bd*<G_U#2l9N@Y9~(ygCl-h&9i8Yj9_3cV?DM!lxf11kY_LYnfWL$a@7F3
zk0$$mP<ka_iUf&lMdUX}1{nJ-EWCBw#je~5Smwg)p`tEv>3pk0^2UtiF9Z+(a@wy6
zUdw8J*ze$K#=$48IBi1U%;hmhO>lu!uU;+RS}p&6@rQila7WftH->*A4=5W|Fmtze
z)7E}jh@cbmr9iup^i%*(uF%LG&!+Fyl@LFA-}Ca#bxRfDJAiR2dt6644TaYw1Ma79
zt8&DYj31j^5WPNf5P&{)J?WlCe@<3u^78wnd(Ja4^a>{^Tw}W>|Cjt^If|7l^l)^Q
zbz|7~CF(k_9~n|h;ysZ+jHzkXf<NcXr7lv4BLC0%brrpzF{-obsvQr%!_>(*O*@5m
zLzUmbHp=x!Q|!9NVXyipZ3)^GuIG$k;D)EK!a5=8MFLI_lpf`HPKl=-Ww%z8H_0$j
ztJ||IfFG1lE9nmQ<au0Ml%cF(=R}3nZqu!gn~ulcq{4`|I}2tuFXsdOn=eq9Qz{LW
zP^cfInuhA7QFIUcH%13E<=O+Vy|WwD8Y7tHV5z9{b#53O<eDk6+LD+O<*lHC*Sh-<
zQQ*d{QylAFdIrjkp%D|@{O_AHu^XIETj$pt=r^Iy${cPPEHt@N92tqR6yn>0+jPQy
zCBdKkjArH@K7jVcMNz);Q(Q^R{d5G?-kk;Uu_IXSyWB)~KGIizZL(^&qF;|1PI7!E
zTP`%l)gpX|OFn&)M%txpQ2F!hdA~hX1Cm5)IrdljqzRg!f{mN%G~H1&oqe`5eJCIF
zHdD7O;AX-{XEV(a`gBFJ9ews#CVS2y!&>Cm_dm3C8*n3MA*e67(WC?uP@8TXuMroq
z{#<dYp{{+xCUwQw6)w9(r^`^0<F6$P{m>w$%z@CBIkRM7?}Xib+>hRjy?%G!fiw8!
z8(gB+8J~KOU}yO7UGm&1g_MDJ$IXS!`+*b*QW2x)9>K<JF7b%^NJe_9Fs0_(5~kP{
zjLlh(Gb|iDD!%2k=};N1Ay-P7$Wu_KP|<Nv<px9DnR*Bhp`@^|=#?&n9#0)w-FDC^
zYYwq=gkfiuN_5CjVN9Ao)scz%pogt!6S`BY&a-LBZ0vR8Hs`uYWwn}-oY<_#H(3U4
z+C^OQlGq~g8s<Q&bZc>~Y*E&bYMnjl6h!{17_8d!%&9D`a7r&LKZjC<&XOvTRaKJ1
zUY@hl5^R&kZl3lU3njk`3dPzxj$2foOL26r(9zsVF3n_F#<NB6ex9*oBW}l?xfbxx
zL%E!#nXs+R%q=x9ZnSy_@kOHMCrx3@5&BuHZd_<OOwDuA?g-PK!m67qWTCZlm0wKU
zv#i7p-7isYt{yv)OR8I5o;!7xop*Zm6Rp~J_EdjQW~sUFuwoyaW1U&NaV|M4U1?nR
z@)EUG9kIA_lYfhiyvI%HWy;Ge%?fKvOXHCrMb%0xeab5(rJo188D&|PUo17GFJ{-P
zs?t#M)7w#0RHw{KaZQP;u<ZWKm`x0&oP9ITEjmgxyDYbPrK*U@Usmmw0c2<WSXv-G
zvb6FvJhqfc@v@g(G}B*mRq{2pTwn0X@yc3sxqx=5S4D&>v)s5vv3<FgSd?p+)!kNm
zTv$3*E<J6vu2~)lp%4nMdtWE@=#AViY%^W&8R2_<v(+Qa%Mf{$Tn~RH;PHc?^uW;B
zl33*<G2>@dgs|lP#eylq62{<-vczqP!RpVBTgI>@O6&sU>W|do17+#OzQ7o5A$ICH
z?GqwqnK^n2%LR;$^oZM;)+>$X3s2n}2jZ7CdWIW0lnGK-<n4*9i9?XprV!b-2yz1y
z82;&r=GhqHm&zBz3e~(LKRa(8ZwPt%3TYt5`IuWWTX+)iO!EB5qiR4W$RDCd`g{-j
zZuyRBvdZnk><gEOlAyZgBQiT7{>b#EG01)P@aU`pg}th&J-TrU`tIpb5t((0eu|!u
zQz+3ZiOQ^?RxxK4;zs=l8q!-n7X{@jSwK(iqNFiRColuEOg}!7cyZi`iBX4g1pNBj
zAPzL?P^Ljhn;1$r8?bc=#n|Ed7wB&oHcw()&*k#SS#h}jO?ZB246EGItsz*;^&tzp
zu^YJ0=lwsi`eP_pU8}6JA7MS<SY@ZXteVGu2D;{e_dFnzL(OQbWI#IL1J(@}vxKG~
z{>;9pfD;DsSsLo~ogzMNP70@@;Fm8f0^;>$Z>~<d_jp#pvX)$*IF^kRoeC(j+t)Ur
zPx*FO4h)ZG=iqY;QK6W@ekh%ILEiXbr05ou^~><kZopq=@-e)e2pdVj4ZJKNAd~~=
zIWD3^k4g6+ly88l1dUP7-<u$%X=hfWc{o8z>}GWRw!W5J3tNX*^2+1f3hz{~rIzJo
z6W%J(H!g-eI_J1>0juX$X4Cl6i+3wbc~k146UIX&G22}WE<iA2ePZPFMn_vlC3@`(
zC;LX5HFTJ@i$J`Hbx0sRaj^uiUmU^s{mchNU>>0ga#WLsn9tY(&29zBvH1$`iWtTe
zG2jYl@P!P)eb<5DsR72BdI7-zP&cZNI{7q3e@?N8IKc4DE#UVr->|-ryuJXk^u^>4
z$3wE~=q390;XuOQP~TNoDR?#|NSPJ%sTMInA6*rJ%go|=YjGe!B>z6u$IhgQSwoV*
zjy3F2#I>uK{42{&IqP59)Y(1*Z>>#W8rCf4_eVsH)`v!P#^;BgzKDR`ARGEZzkNX+
zJUQu=*-ol=Xqqt5=`=pA@BIn@6a9G8C{c&`i^(i+BxQO9?YZ3iu%$$da&Kb?2kCCo
zo7t$UpSFWqmydXf@l3bVJ=%K?SSw)|?srhJ-1ZdFu*5QhL$~-IQS!K1s@XzAtv6*Y
zl8@(5BlWYL<vlUo^g==w+bwzmrMIfe1OGTk=p=b_r!$VPWnqI4+K-Q0Kn&YY_INtV
ze5P(@!H@m0AM%dGQN5FSnZ`He_+j(1bNGu}ee2>t1yAWy?rMD&bwze8bC3-GfNH=p
zynNFCdxyX?K&G(ZZ)afguQ2|<I|ToEQs5dh02L^JB6>r;XoV^=^(;Cku#qYn4<V}b
zA&FlaPRwlltsTXe9~a58?uH)L#hLx*;|`>Lus`UeKt6rAlFo_rU`|Rq<F_mt<XG?>
z&G?~iWMB<P-m~>io<78of-2X(ZYHx~=U0Vz4btyXkctMKdc9UM!vYr~B-(>)(Hc|D
zMzkN4!PBg%tZoh+=Gba!0++d193gbMk2&krfDgcbx0jI92cq?FFESVg0D$>F+bil}
zY~$)|>1HZsX=5sAZ2WgPB5P=8X#TI+NQ(M~GqyVB53c6IdX=k>Wu@A0Svf5#?uHaF
zsYn|koIi3$(%GZ2+G+7Fv^lHTb#5b8sAHSTnL^qWZLM<(1|9|QFw9pnRU{svj}_Al
zL)b9>fN{QiA($8peNEJyy`(a{&uh-T4_kdZFIVsKKVM(?05}76E<BOuTKNZ>Ez?#W
za^fiZOAd14IJ4zLX-n7Lq0qlQ^lW8Cvz4U<X+>KkV9~P}>sq0?xD3vg+$4vLm~C(+
zM{-3Z#qnZ09bJ>}j?6ry^h+@PfaD7*jZxBEY4)UG&daWb??6)TP+|3#Z&?GL?<NWw
zpo!n^_Mnx`#l`Mtp<H71ndq}LH(ZXJlzYuNAHINUglm=WWXJLtuPRY2?rIWUs=h@;
z1r9;ol65y`xO*SzvRa8o!D+_s;~<Bb-h5u71zg5ymFjIboenFkEakiwkF#l0c-sut
znM=(poO3Xq&}pnDV!O6|+_sscTBqqe%{pj$E^ku;b!#-zj>1i+280CFsE|vIXQbm|
zM}Pk!U`U5NsNbyKzkrul-DzwB{X?n3E6?TUHr{M&+R*2%yOiXdW-_2Yd6?38M9Vy^
z*lE%gA{wwoSR~vN0=no}tP2Ul5Gk5M(Xq`<W>$nw#ndFk`tcpd5A=Idue`XZ!FS>Q
zG^0w#>P4pPG<EP*xHW9WCTGn>+*NC9gLP4x2m=cKP}YuS!l^?sHSFf<ssGXChcP9X
za)*XSF8xSAX6O&AkMIyXtB<sR`J2gFTR8ck#bl<tOy9ZU%W%Jooi$>tZy{4CoQrb_
z^20(NnG`wAhMI=eq)SsIE~&Gp9Ne0nD4%Xiu|0Fj1UFk?6avDqjdXz{O1nKao*46y
zT8~iA%Exu=G#{x=KD;_C&M+Zx4+n`sHT>^>=-1YM;H<72k>$py1?F3#T1*ef9mLZw
z5naLQr?n7K;2l+{_uIw*_1nsTn~I|kkCgrn;|G~##hM;9l7Jy$yJfmk+&}W@JeKcF
zx@@Woiz8qdi|D%aH3XTx5*wDlbs?dC1_nrFpm^QbG@wM=i2?Zg;$VK!c^Dp8<}BTI
zyRhAq@#%2pGV49*Y5_mV4+OICP|%I(dQ7x=6Ob}>EjnB_-_18*xrY?b%-yEDT(wrO
z9RY2QT0`_OpGfMObKHV;QLVnrK%mc?$WAdIT`kJQT^n%GuzE7|9@k3ci5fYOh(287
zuIbg!GB3xLg$YN=n)^pHGB0jH+_iIiC=nUcD;G6LuJsjn2VI1cyZx=a?ShCsF==QK
z;q~*m&}L<-cb+mDDXzv<F>vrRsybcgQ;Vg21P(uLv5I+eGc7o7tc6`;OA9{soHFOz
zT~2?>Ts}gprIX$wRBb4yE>ot<8+*Bv`qbSDv*VtRi|cyWS>)Fjs>fkNOH-+PX&4(~
z&)T8Zam2L6puQl?;5zg9h<}k4#|yH9czHw;1jw-pwBM*O2hUR6yvHATrI%^mvs9q_
z&ccT0>f#eDG<^WG^q@oVqlJrhxH)dcq2cty@l3~|5#UDdExyXUmLQ}f4#;6fI{f^t
zDCsgIJ~0`af%YR%Ma<z>5VQq-p21k`vaBu6WE?66+5=XUd%Ay%D$irN>5LhluRWt7
zov-=f>QbMk*G##&DTQyou$s7UqjjW@k6=!I@!k+S{pP8R(2=e@io;N8E`EOB;OGoI
zw6Q+{X1_I{OO0HPpBz!X!@`5YQ2)t{+!?M_iH25X(d~-Zx~cXnS9z>u?+If|iNJbx
zyFU2d1!ITX64D|lE0Z{dLRqL1Ajj=CCMfC4lD3&mYR_R_VZ>_7_~|<^o*%_&jevU+
zQ4|qzci=0}Jydw|LXLCrO<tY^5#SIaz%jR-X`&*7)+bTVSc1BE2BLn%vVH`Mbz1R-
z>l1_P6Xf@c0$ieK2^7@A9UbF{@V_0p%lqW|L?5k>bVM8|p5v&2g;~r>B8uo<4N+`B
zH{J)h;SYiIVx@#jI&p-v3dwL5QNV1oxPr8J%ooezTnLW>i*3Isb49%5i!&ac_dEXv
zvXmVUck^QHmyrF8>CGXijC_R-y(Qr{3Zt~EmW)-nC!tiH`wlw5D*W7Pip;T?&j%kX
z6DkZX4&}iw>hE(boLyjOoupf6JpvBG8}jIh!!VhnD0>}KSMMo{1#uU6kiFcA04~|7
zVO8eI&x1`g4CZ<2cYUI(n#wz2MtVFHx47yE5eL~8bot~>EHbevSt}LLMQX?odD{Ux
zJMnam{d)W4da{l7&y-JrgiU~qY3$~}_F#G7|MxT)e;G{U`In&?`j<5D->}cb{}<s=
z)!EcZ!rs<Y#@^oA)#0D)Gvy7r4FLpRXcD*RfTd(<C=@A5lICI1^#y3rLIVLJon(Px
z9#Jw)(4Yq5v4TSV<tUJH3ExZMzKTk&i(qL2_(Map=flfs&WkPnAHQ!Ph9FQ-#b`+n
zGGm<qkbNX1D53P^JDqBMk-0!hNJ&trQIk`mzGOz)`{-cJ&~H;?Q%CleBz;+Wy0Yj`
zyHSagKdo#qV6?6Vcv+pcT%^1Q-l@v({R}QyX*+WEw%BJmI(}Q@j4m`CawF`x{MPHL
za$h&MF~4nMuyWgQrt}RgV#pg|Y^CiI*j!3z!tB-Jp4;1uuh(==9iU5dSb3$ZFATE!
z>{T(4DF0BOk<QYr>-=1195KB-E*o@c?`>y#4=dMtYtSY=&L{!TAjFVcq0y@AH`vH!
z$41+u!Ld&}F^COPgL(EE{0X7LY&%D7-(?!kjFF7=qw<;`V{nwWBq<)1QiGJgUc^Vz
ztMUlq1bZqKn17|6x6iAHbWc~l1HcmAxr%$Puv!znW)!JiukwIrqQ00|H$Z)OmGG@=
zv%A8*4cq}(?qn4rN6o`$Y))(MyXr8R<2S^J+v(wmFmtac!%VOfN?&(8Nr!T@kV`N;
z*Q33V3t`^rN&aBiHet)18wy{*wi1=W!B%B-Q6}SCrUl$~Hl{@!95ydml@FK8P=u4s
z4e*7gV2s=YxEvskw2Ju!2%{8h01<bQ)d%wXmu1Zpj%~-&jsiWxq+->rx-3`NCPc(O
zH&J0VH5etNB2KY6k4R@2Wvl^Ck$MoR3=)|SEclT2ccJ!RI9Nuter7u9@;<u*AgOz(
zn=C13+36e?Wp?2OIME<hmtjrXzJ<Zd*?$>sWf-%um;GfI!=eEIQ2l2p_YWUd{|6EG
ze{yO6;lMc>;2tPrsNdi@&1K6(1;|$xe8vLgiouj%QD%gYk`4p{Ktv9|j+!OF-P?@p
z;}SV|<w!@0*CQ5@xp9@`8c_*)IC@^rAGd{(#wPf?$`(^V&!%1qI&#?UztvBAF!4M;
z_oxBXB0!;X3yhd^D}+Xx4sUHZH*0n|si;UgfM!*1c|d1h4nY076_94CJP`FR$D}_!
zDgwP#mZV0tbmF7vmG7Log$Afqr(GuMl<urHsSR(EhO7^7wNPIUT%rDwjj%sGil746
zDLtAZLp-7)K|QJh+bT3@0I$b@q3|9LuBZk*!Xn-Gb?+~>oIK)iwlBs+`ROXkhd&NK
zzo__r!B>tOXpBJMDcv!Mq54P+n4(@dijL^EpO1wdg~q+!DT3lB<>9AA<tf}r`cy*Y
zjhdtI5OMNT6H0#L@X?3Sm%kGA7Vl5JMh4bZuEy3uPM@!CETCEPH`bN;-XzRi=Uj<*
zy1%%&-XKAU$eorwmA2>NSe!T1XgC=J^)IP0XEZ()_vpu!!3HQyJhwh?r`Ae%Yr~b%
zO*NY9t9#qWa@GCPYOF9aron7thfWT`eujS4`t2uG6)~JRTI;f(ZuoRQwjZjp5Pg34
z)rp$)Kr?R+KdJ;IO;pM{$6|2y<ydqUT>=k_siqvp%)2||cHTe|b5Ht8&A{wazGNca
zX$Ol?H)E_R@SDi~4{d-|8nGFhZPW;Cts1;08TwUvLLv&_2$O6Vt=M)X;g%HUr$&06
zISZb(6)Q3%?;3r~*3~USIg=HcJhFtHhIV(siOwV&QkQe#J%H9&E21!C*d@ln3E@J*
zVqRO^<)V^ky-R|%{(9`l-(JXq9J)1r$`uQ8a}$vr9E^nNiI*thK8=&UZ0dsFN_eSl
z(q~lnD?EymWLsNa3|1{CRPW60>DSkY9YQ;$4o3W7Ms&@&lv9eH!tk~N&dhqX&>K@}
zi1g~GqglxkZ5pEFkllJ)Ta<O6(=j@N_YA4+m(2{`eegY!ZQ2^vALR<RgI6}@oJ;#Q
znz8Q+-c~%`4rP2NC%pl75Va8USgVLiZL*d#F+vsZ>1I^c&Bt6#r(QLQ02yHTaJB~-
zCcE=5tmi`UA>@P=1LBfBiqk)HB4t8D?02;9eXj~kVPwv?m{5&!&TFY<knKM4n)!Ph
zud#tQR<C%y^0~@DM`a6)LueXb{y5yQ{QdB(pAh_Nx5%(@`(@LGcfv~*Wnh>hu>3=_
zsGmYZ^mo*-j69-42y&Jj0cBLLEulNRZ9vXE)8~mt9C#;tZs;=#M=1*hebkS;7(aGf
zcs7zH(I8Eui9UU4L--))yy<O?Y9%&u#eL}xwSxY`c_7W7JcW|iGpGkga)aNR1NtnV
zsQ!z$?wFhYyP2W>`&d&$In&VA2?DAEss4LAPCLd>-$i?lpXvn!gu^JJ$(DoUlc<UX
zkfN^{^6VUfk4qkMm$Kwn8iV7sNct*PLMd9WvC5vZDv+`U&Q-ZGnQrAf`3aDr3@9ll
zcH!Spxa>6wE98VLZ*z`QGQov5l4Fm_h?V-;mHLYDVOwKz7>e4+%AzeO>P6v}ndPW|
zM>m#6Tnp7K?0mbK=>gV}=@k*0Mr_PVAgGMu$j+pWxzq4MAa&jpCDU&-5eH27Iz>m^
zax1?*HhG%pJ((tkR(V(O(L%7v7L%!_X->IjS3H5kuXQT2!ow(;%FDE>16&3r){!ex
zhf==oJ!}YU89C9@mfDq!P3S4yx$aGB?rbtVH?sHpg?J5C->!_FHM%Hl3#D4eplxzQ
zRA+<@LD%LKSkTk2NyWCg7u=$%F#;SIL44~S_OGR}JqX}X+=bc@swpiClB`Zbz|f!4
z7Ysah7OkR8liXfI`}IIwtEoL}(URrGe;IM8%{>b1SsqXh)~w}P>yiFRaE>}rEnNkT
z!HXZUtxUp1NmFm)Dm@-{FI^aRQqpSkz}ZSyKR%Y}Y<Q&WCZ#r6E1BX>HNzBk)ZIp}
zMtS=aMvkgWKm9&oTcU0?S|L~CDqA+sHpOxwnswF-fEG)cXCzUR?ps@tZa$=O)=L+5
zf%m58cq8g_o}3?Bhh+c!w4(7AjxwQ3>WnVi<{{38g7yFboo>q|+7qs<$8CPXUFAN<
zG&}BHbbyQ5n|qqSr?U~GY{@GJ{(Jny{bMaOG{|IkUj7tj^9pa9|FB_<+KHLxSxR;@
zHpS$4V)PP+tx}22fWx(Ku9y+}Ap;VZqD0AZW4gCDTPCG=zgJmF{|x;(rvdM<f^n;1
zK8nxqYR0vKH0j_lDlpPKZ&MGwB{uMn`Y?-pX_!Y3B)-jRTo&O^8pthSIE0&!0lK-e
z!icB)w$6c%`*wHe1Fz?U<?TZjyK8JuG0UC$ZCke^hB6%|%?F1X$1uXP^O6o2PCxRi
zb_5>|2|9a}cex6xrMkERnkE;}jvU-kmzd%_J50$M`lIPCKf+^*zL=@LW`1SaEc%=m
zQ+lT06Gw+wVwvQ9fZ~#qd430v2HndFsBa9WjD0P}K(rZYdAt^5WQIvb%D^Q|pkVE^
z<umx#lsJRB+%c;<9rnPd8EZLPtdXF8y%S2H@ouSr1qOSZk)i$^f3$XJg9S<yWHU+7
zyJJ%uaeqUu9^B#_n2Ir_nIYz}G3SZ_C|5(`c6Umw#_yBgS{UuH<_&oA!pzsBV%g@=
zbOzA1`OA)5@fUbFgE?}SVsAWLGVW?bLByY#LXc_UE*PeNYf={+;y-vKh@$+ue#tsu
zvCKGNIefnaDUw~m>te$&#~zmULFACGfS#g=2OLOnIf2Of-k!(BIHjs77nr!5Q1*I9
z1%?=~#Oss!rV~?-6Gm~BWJiA4mJ5TY&iPm_$)H1_rTltuU1F3<q3^BkZ&_=uH2O^K
z_@P51{S(`LSn2c$B(%yIo=USrBfbZd`d}}bPg&0tq#f2!iBZc9Z>I(qTQ^U$S>%$l
z)Wx1}R?ij0idp@8w-p!Oz{&*W;v*IA;JFHA9%nUvVDy7Q8woheC#|8QuDZb-L_5@R
zOqHwrh|mVL9b=+$nJxM`3eE{O$sCt$UK<z2Kci>^2@L$R(r^-_+z?lOo+me-VW=Zw
z-Bn>$4ovfWd%S<yVaGCiuR4}{b|0tZrdZYdj>PY`ab-u9{INc*k2h+yH%toDHIyqQ
zO68=u`N}RIIs7lsn1D){)~%>ByF<>i@qFb<-axvu(Z+6t7v<^z&gm9McRB~BIaDn$
z#xSGT!rzgad8o>~kyj#h1?7g96tOcCJniQ+*#=b7wPio>|6a1Z?_(TS{)KrPe}(8j
z!#&A=k(&Pj^F;r)CI=Z{LVu>uj!_W1q4b`N1}<u;U_b=ty|*S;DXz*F-)!)F0Pv+Q
zRm=!T^zTn*A6)$bH1cl>E(i%;BWjbEcnD=mv$FL$l?zS6bW!{$7j1GR5ocn94P2u{
z70tAAcpqtQo<@cXw~@i-@6B23;317|l~S>CB?hR5qJ%J3EFgyBdJd^fH<ao26B*v)
zGUaiB1_W^rk+d9W+h~_tj2D}FfPY~B-BL~)lzp|oFVck~{r8sIIlCCz*!+vHo}=OE
zgW`_*^W8W`lLWY+AcSs_rDfwxzeg23BqYRWi$p*e3{sqP3719K#C&l{6X2y_TO;0c
zk>Zu7AzHF(BQ!tyAz<BOKd)9J&U=CXtSstlZ^pj1MMKG$H~T%~{<Zzl`|=?>^L0`X
z23S4Fe{2X$W0$zu9gm%rg~A>ijaE#GlYlrF9$ds^QtaszE#4M(OLVP2O-;XdT(XIC
zatwzF*)1c+t~c{L=fMG8Z=k5lv>U0;C{caN1NItnuSMp)6G3mbahu>E#sj&oy94KC
zpH}8oEw{G@N3pvHhp{^-YaZeH;K+T_1AUv;IKD<=mv^&Ueegrb!yf`4VlRl$M?wsl
zZyFol(2|_QM`e_2lYSABpKR{{NlxlDSYQNkS;J66aT#MSiTx~;tUmvs-b*CrR4w=f
z8+0;*th6kfZ3|5!Icx3RV11sp=?`0Jy3Fs0N4GZQMN=8HmT6%x9@{Dza)k}UwL6JT
zHRDh;%!XwXr6yuuy`4;Xsn0zlR$k%r%9abS1;_v?`HX_hI|+EibVnlyE@3aL5vhQq
zlIG?tN^w@0(v9M*&L+{_+RQZw=o|&BRPGB>e5=ys7H`nc8nx)|-g;s7mRc7hg{GJC
zAe^vCIJhaj<rU9d-Ny$?&}6qolDp7MDNB|ftJI`wi&EhaNhHyV!qQfb_Q>mm7C6g!
zL&!WAQ~5d_5)00?w_*|*H>3$loHrvFbitw#WvLB!JASO?#5Ig5$Ys10n>e4|3d;tS
zELJ0|R4n3Az(Fl3-r^QiV_C;)lQ1_CW{5bKS15U|E9?ZgLec@%kXr84>5jV2a5v=w
z?pB1GPdxD$IQL4)G||B_lI+A=08MUFFR4MxfGOu07vfIm+j=z9tp~5i_6jb`tR>qV
z$#`=BQ*jpCjm$F<t%->0+F)L%xRlnS%#&gro6PiRfu^l!EVan|r3y}AHJQOORGx4~
z&<)3=K-tx518DZyp%|!EqpU!+X3Et7n2AaC5(AtrkW>_57i}$eqs$rupubg0a1+WO
zGHZ<ibB|u&Jk?tUGE|?~tl5Wk^jlF-{lPR;A5i_2TUJp0F;38(es)rx!d-0-m4P-!
z$~|tV-l!W$kj%u&D~eY>KLN2L0D;ab%{_S1Pl<uJj0^JDir_rTS5CizT^_%RU3Cwc
zfrHnUz@7T<9U{4O%SD*qhHiuSo|}zv3Hju=+>m|hx8R?O14*w*f&2&bB050n!R2by
zw!@XOQx$SqZ5I<(Qu$V6g>o#A!JVwErWv#(Pjx=KeS0@hxr4?13zj#oWwPS(7Ro|v
z>Mp@Kmxo79q|}!5qtX2-O@U&&@6s~!I&)1WQIl?lTnh6UdKT_1R640S4~f=_xoN3-
zI+O)$R@RjV$F=>Ti7BlnG1-cFKCC(<Cu6MUX_IBo_X35UX_<48O%CsD25V#~38R@v
zrtYIkXvf1CPBiwCyX%=srhV;xX%`i(ICDDA6?ULc$>t|Qjm{SalS~V-t<tWc<BV1;
zl_jTzT9WFjJ~QeHdyK~l8BJDMnzlnWR?wVpES%e_)7o6AC7w~n8DW>X#+2ekRhwmN
zZr`8{QF6y~Z!D|{=1*2D-JUa<(1Z=;!Ei!KiRNH?o{p5o3crFF=_pX9O-YyJchr$~
zRC`+G+8kx~fD2k*ZIiiIGR<8r&M@3H?%JVOfE>)})7ScOd&?OjgAGT@WVNSCZ8N(p
zuQ<bOx+QY5+%zcISi3vNjYInP2!bhID0f~o9vf+-rhLL{z1^Ck(#`qsgx*#5swyXT
zW>G~76GE3%(%h1*vUXg$vH{ua0b`sQ4f0*y=u~lgyb^!#CcPJa2mkSEHGLsnO^kb$
zru5_l#nu=Y{rSMWiYx?nO{8I!gH+?wEj~UM?IrG}E|bRIBUM>UlY<`T1EHpRr36vv
zBi&dG8oxS|J$!zoaq{+JpJy+O^W(nt*|#g32bd&K^w-t>!Vu9N!k9eA8r!Xc{utY>
zg9aZ(D2E0gL#W0MdjwES-7~Wa8iubPrd?8-$C4BP?*wok&O8+ykOx{P=Izx+G~hM8
z*9?BYz!T8~dzcZr#ux8kS7u7r@A#DogBH8km8Ry4slyie^n|GrTbO|cLhpqgMdsjX
zJ_LdmM<k-VT(PJj^o5EU9N}k~N8WtTC-IGZ`@y!j$sb^<J0;G@Qw2FyCS!3I_NA$4
z1f*^zNnJ-2I0{osRtQts^V?d(XVo8U_KxuKrC4_(t;qw3T5EIb1gaTiFo3yT&HyFL
z)1@c>#I&4LqqsOUIXK8gW;V0B(7^$y#h3h>J0k^WJfAMeYek%Y-Dcb_+0zPJez!GM
zAmJ1u;*rK=FNM0Nf}Y!!P9c4)HIkMnq^b;JFd!S3?_Qi2G#LIQ)TF|iHl~WKK6JmK
zbv7rPE6VkYr_%_BT}CK8h=?%pk@3cz(UrZ{@h40%XgT<XHMp$hv;h9Ymj#=odkk`i
zIQae`_=X#DiyU&N400<DsTZGknpd*i59`VZ(hlvyF={mwt^rqfpTI2&<T<g_&ag;)
zGmdv3$7_Umm3*d1pC<tD4&^z@fB#qeFKt~J{6LxaG(+}hgg|*Exu--o{)yT#JuFbk
z1;57xTR<^av=7#O$H&Fm{_yrRCu{yYJoJ}c0L{yx#X=<de!)a1JlNVp083z$!k1?|
zV)^ps1(-LWXGsXjQ$H~1;~fb%PNBhFP?}VP6a;UunlMt9FKF=Z7zjl{Vm5wAE|rFq
z1-k1JTp~NHKqro%r!pzCx_v|wc?QzZb;2~gF~c_e(7kI?gTf@Sl;&2zZGHBdXMu10
ze@7*&Fo`5Se_O_wf2XJaP0LvFpQz-YM_~(7W9xrFv6N(8d1OJ9&>hP*-Oeo`T0eq9
zA8BnWZKzCy5e&&_GEsU4*;_k}(8l_&al5K-V*B<vk;3_5Y5GsaQRXITZ7En5+1cr}
zoEOfUwTvx(fB#P)g+XFq$3s&MIR%RGTY*w)u1F^x)_4KQF{~iPr`KL;JvOUA!)Bl1
z9p@=a4SF1Po>FM=O~;MgRkYsOs%9eOY6s6AtE*<7GQAR2ulC3RAJrG_P1iQK5Z~&B
z&f8X<>yJV6)oDGIlS$Y*D^Rj(cszTy5c81a5IwBr`BtnC6_e`ArI8CaTX_%rx7;cn
zR-0?J_LFg*?(#n~G8cXut(1nV<GD8u>F0Oka$A<Xrs+39Fcy_UX4+wJsyL;Ad#|W_
zoZzvm=HX_}HyBFXw08LR4`!>$1FGcERU<^ggx;p@CZc?3UB41RY+wLS`LWFNSs~YP
zuw1@DNN3lTd|jDL7gjBsd9}wIw}4xT2+8dBQzI00m<@?c2L%>}QLfK5%r!a-iII`p
zX@`VEUH)uj^$;7jVUYdADQ2k*!1O3WdfgF?OMtUXNpQ1}QINamBTKDuv19^{$`8A1
zeq%q*O0mi@(%sZU>Xdb0Ru96CFqk9-L3pzLVsMQ`Xpa~N6CR{9Rm2)A|CI21L(%GW
zh&)Y$BNHa=FD+=mBw3{qTgw)j0b!Eahs!rZnpu)z!!E$*eXE~##yaXz`KE5(nQM`s
zD<pRzTt9Ga7_+7V*(vgeNjPLq#T#Hzh4oMyk4m^&mDHa-;LXM`BMlpNPVXZiWB!7-
zsrLYk0v?{Pinwui>!$vW9XH)iMxu9R>r$VlLk9oIR%HxpUiW=BK@4U)|1WNQ=mz9a
z^!KkO=>GaJ!GBXm{KJj^;kh-MkUlEQ%lza`-G&}C5y1>La1sR6hT=d*NeCnuK%_LV
zOXt$}iP6(YJKc<sy3IAHEj2Y-R)3MS?rC66If(_;`nr~Onw70}P1hEBm+!itUy1C`
zNpHpki6_MC$7{&PcGt_M^XxtUNv`)v*iXj|1|scVAGjs`iL^4oZ_EXmgi;5b%!&n+
ziIZl66eo#;Grax0|H0Th2FKohS;Mhy+qQFJ+qP}z#I|iaIk9cqPEKq)Z~pVlJTr68
zJXP<9U-g%+tE>9j-Fxq~*ItVUqljQ8?oaysB-EYtFQp9oxZ|5m0^Hq(qV!S+hq#g(
z?|i*H2MIr^Kxgz+3vIljQ*Feejy6S4v~jKEPTF~Qhq!(ms5>NGtRgO5vfPPc4Z^AM
zTj!`5xEreIN)vaNxa|q6qWdg>+T`Ol0Uz)ckXBXEGvPNEL3R8hB3=C5`@=SYgAju1
z!)UBr{2~=~xa{b8>x2@C7weRAEuatC)3pkRhT#pMPTpSbA|tan%U7NGMvzmF?c!V8
z=pEWxbdXbTAGtWTyI?Fml%lEr-^AE}w#l(<7OIw;ctw}imYax&vR4UYNJZK6P7ZOd
zP87XfhnUHxCUHhM@b*NbTi#<F%^Z|eYk;z2_lk&RVh7s<F5xO2t#&+J(_Y0MwZqrY
zicy(G9z6&?{09>(-8|wcv%3BGNs#zRCVV(W?1Qj6^PPQa<{yaBwZ`+<`w|;rqUY_C
z&AeyKwwf*q#OW-F()lir=T^<^wjK65Lif$puuU5+tk$;e_EJ;Lu+pH>=-8=PDhkBg
z8cWt%@$Sc#C6F$Vd+0507;{OOyT7Hs%nKS88q-W!$f~9*WGBpHGgNp}=C*7!RiZ5s
zn1L_DbKF@B8kwhDiLKRB@lsXVVLK|ph=w%_`#owlf@s@V(pa`GY$8h%;-#h@<I6M_
zmQBeLGoxDbjVm1w<bC@g^^f(C!^JL|q^~JGpu4s;6B8qK+5^Y5Qq9@Z$yi1AO_ivY
zEj2e_U?RYgY($+y4MYyPw@#Znh;BBeSCVn{gx>TsO|Y8V=n@*!Rog7<7Cid%apR|x
zOjhHCy<N%=9>fbIt%+*PCveTEcuiDi%Wx;O;+K=W?OF<?k#V0K7HZbJn*d3I+eoH#
zh7<l$XDBh2e3X@S)0xR1RL*X3v}anZNmTRLP100Vjg6lZsj8M4WV<xI)QGou52W;l
zuhA|fVCliO=-1Jr275Sx<Y+M^NR?|nFbw_$)30P*nj@^6+|ZdgJZ18l!}qu2UJUSH
z1R0|V6_~e{(m?E}wM3qUG_Q$t&XB<F<iQ0B?7yghy}e3`PL?Jnn_FH7zs7FvV}ZNC
zg-k1nj;~OaAd0bVj&A17jIs@8j;@`1Da87%aS+QW)3w-0g!{V<Z8Jk0K;t-e-m_}H
z#$DpTS=ZJ!079fqU)_vsqe{Hxz{t*PFrYaR_X{Idl~pteGXU-!HXH+n-Nm@~!Nn|q
zjK^|6Bi^u9r}}mzbV)k27Kxg2T1S^j^-m&I%;>UV%)%~6;gl?<0%)?snDDqIvkHF{
zyI02)+lI9ov42^hL>ZRrh*HhjF9B$A@=H94iaBESBF=eC_KT$8A@uB^6$~o?3W<f9
zYtSca#$B|92$2MdaDc&Gb6a^9xjGKojcdPg>m5t1OIaqF^~><2?4e3c&)@wKn9bD?
zoeCs;H>b8DL^F&>Xw-xjZEUFFTv>JD^O#1E#)CMBaG4DX9bD(Wtc8Rzq}9soQ8`jf
zeSnHOL}<+WVSKp4kkq&?SbETjq6yr@4%SAqOG=9E(3YeLG9dtV+8vmzq+6PFPk{L;
z(&d++iu=^F%b+ea$i2UeTC{R*0Isk;vFK!no<;L+(`y`3&H-~VTdKROkdyowo1iqR
zbVW(3`+(PQ2>TKY>N!jGm<sD6AnGF=)0Re*7@0HIc_nG=Iw;>Go7oeoB8O|P_!Ic@
zZ^;3dnuXo;WJ?S+)%P>{Hcg!Jz#2SI(s&dY4QAy_vRlmOh)QHvs_7c&zkJCmJGVvV
zX;Mtb>QE+xp`KyciG$Cn*0?AK%-a|=o!+7x&&yzHQOS>8=B*R=niSnta^Pxp1`=md
z#;$pS$4WCT?mbiCYU?FcHGZ#)kHVJTTBt^%XE(Q};aaO=Zik0UgLcc0I(tUpt(>|&
zcxB_|fxCF7>&~5eJ=Dpn&5Aj{A^cV^^}(7w#p;HG&Q)EaN~~EqrE1qKrMAc&W<U9$
z+^)SZeHD%7BgO}J?hdzGer@n(wj6EYe>XIE;>@<&)5;gD2?={Xf@Mvn@OJKw=8Mgn
z!JUFMwD+s==JpjhroT&d{$kQAy%+d`a*XxDEVxy3`NHzmITrE`o!;5ClXNPb4t*8P
zzAivdr{j_v!=9!^?T3y?gzmqDWX6mkzhIzJ-3S{T5bcCFMr&RPDryMcdwbBuZbsgN
zGrp@^i?rcfN7v0NKGzDPGE#4yszxu=I_`MI%Z|10nFjU-UjQXXA?k8Pk|OE<(?ae)
zE%vG#eZAlj*E7_3dx#Zz4kMLj>H^;}33UAankJiDy5ZvEhrjr`!9eMD8COp}U*hP+
zF}KIYx@pkccIgyxFm#LNw~<U{`Via^B{gMVX)!#|jCh_xM6ikcrvnXbWa+dwBKVSS
zK-4G%y><Bux_?U*2>G&`;o&5)2`5aogs`1~7cMZQ7zj!%L4E`2yzlQN6REX20&O<9
zKV6fyr)TSc<e)zOh9v0_vMgh>JPPzNTC2gL+0x#=u>(({{D7j)c-%tvqls3#Y?Z1m
zV5WUE)zdJ{$p>yX;^P!UcXP?UD~YM;IRa#Rs5~l+*$&nO(;Ers`G=0D!twR(0GF@c
zHl9E5DQI}Oz7<JMjFG_&ureTdMV@FLw-eP(lgkhig$ECHD*ei9Xc()#hw||V#@>4n
zfKP>&$q0($T4y$6w(p=ERAFh+>n%iaeRA%!T%<^+p<H-<uJNd-sy)}Y@~CN#3u5W*
zjI&ROZ_Rx}0(a!_QCcJ9_!&~Uc}E0JQd?M`bT;-C9-Z?5E@UMa&Fe8b7GLT8{XPb5
zyf%i|Q0Xl+SI;QD#Yg>g?M)@ucY<&59$x9M#n+V&>}=nO9wCV{O~lg&v#+jcUj(tQ
z`0u1YH)-`U$15a{pBkGyPL0THv1P|4e@pf@3IBZS4dVJPo#H>pWq%Lr0YS-SeWash
z8R7=jb28KPMI|_lo#GEO|5B?N_e``H*23{~a!AmUJ+fb4HX-%QI@lSEUxKlGV7z7Q
zSKw@-TR>@1RL%w{x}dW#k1NgW+q4yt2Xf1J62Bx*O^WG8OJ|FqI4&@d3_o8Id@*)4
zYrk=>@!wv~mh7YWv*bZhxqSmFh2Xq)o=m;%n$I?GSz49l1$xRpPu_^N(vZ>*>Z<04
z2+rP70oM=NDysd!@fQdM2OcyT?3T^Eb@lIC-UG=Bw{BjQ&P`KCv$AcJ;?`vdZ4){d
z&gkoUK{$!$$K`3*O-j<Zi{jTPO?eI9$VNEqKns5`DQpeK-2u;%g&U>yM1~<ZC)5l@
zIkr@87e@uhA6MH$K<@Z>p-7T*qb)Ys>Myt^;<CgA4AYJg%~h2T>#1&a%O@x8A+E>!
zY<A2w=yT8AF-EkBw>8=eD`ZG)LVagDLBeHg>=atOG?Kr%h4B%E6m@J^C+U|y)XX@f
z8oyJDW|9g=<#f<{JRr{y#~euMnv)`7j=%cHWLc}ngjq~7k**6%4u>Px&W%4D94(r*
z+akunK}O0DC2A%Xo9jyF;DobX?!1I(7%}@7F>i%&nk*LMO)bMGg2N+1iqtg+r(70q
zF5{Msgsm5GS7DT`kBsjMvOrkx&|EU!{{~gL4d2MWrAT=KBQ-^zQCUq{5PD1orxlIL
zq;CvlWx#f1NWvh`hg011I%?T_s!e38l*lWVt|~z-PO4~~1g)SrJ|>*tXh=QfXT)%(
z+ex+inPvD&O4Ur;JGz>$sUOnWdpSLcm1X%aQDw4{dB!cnj`^muI$CJ2%p&-kULVCE
z>$eMR36kN$wCPR+OFDM3-U(VOrp9k3)lI&YVFqd;Kpz~K)@Fa<T;^H>&FRw}L(SoD
z9B4a+hQzZT-BnVltst&=kq6Y(f^S4hIGNKYBgMxGJ^;2yrO}P3;r)(-I-CZ)26Y6?
z&rzHI_1GCvGkgy-t1E;r^3Le30|%$ebDRu2+gdLG)r=A~Qz`}~&L@aGJ{}vVs_GE*
zVUjFnzHiXfKQbpv&bR&}l2bzIjAooB)=-XNcYmrGmBh(&iu@o!^hn0^#}m2yZZUK8
zufVm7Gq0y`Mj;9b>`c?&PZkU0j4>IL=UL&-Lp3j<Z6B(#r?G=5OTIVqppQV7;$oUZ
z_*bfNYVfkU+>&47B5pAW4JceG{!XCA)kT<%2nqCxj<)uy6XR_uws~>_MEKPOpAQ!H
zkn>FKh)<9DwwS*|Y(q?$^N!6<o$@lIm`~9<Ur$vhpA3&|(gF`!3*mR7y8%R>(51O0
z^JM~Ax{AI1Oj$fs-S5d4T7Z_i1?{%0SsIuQ&r8#(JA=2iLcTN+?>wOL532%&dMYkT
z*T5xepC+V6zxhS@vNbMoi|i)=rpli@R9~P!39tWbSSb904ekv7D#quKbgFEMTb48P
zuq(VJ+&L8aWU(_FCD$3^uD!YM%O^K(dvy~Wm2hUuh6bD|#(I39Xt>N1Y{ZqXL`Fg6
zKQ?T2htHN!(Bx;tV2bfTtIj7e)liN-29s1kew>v(D^@)#v;}C4-G=7x#;-dM4yRWm
zyY`cS21ulzMK{PoaQ6xChEZ}o_#}X-o}<&0)$1#3we?+QeLt;aVCjeA)hn!}UaKt<
zat1fHEx13y-rXNMvpUUmCVzocPmN~-Y4(YJvQ#db)4|%B!rBsgAe+*yor~}FrNH08
z3V!97S}D7d$zbSD{$z;@IYMxM6aHdypIuS*pr_U6;#Y!_?0i<Th%7C5rAWptzT;+8
z^q+L14xti*_qZw!_5cZk%7|55dKPFjM~R1_=~fye=uVS6nDqhi)PszECfuz7L#WMP
z!r+BR+k)}Z4nk;GJ*^~}T(1)9OIq4cSY?CPrYrC|{k3|*qwa%HsQZRC>|&yU*@16l
z*dcMqDQgfNBf}?quiu4e>H)yTVfsp#f+Du0@=Kc41QockXkCkvu>FBd6Q+@FL!(Yx
z2`YuX#eMEiLEDhp+9uFqME_E^faV&~9qjBHJkIp~%$x^bN=N)K@kvSVEMdDuzA0sn
z88CBG?`RX1@#hQNd`o^V{37)!w|nA)QfiYBE^m=yQKv-fQF+UCMcuEe1d4BH7$?>b
zJl-r9@0^Ie=)guO1vOd=i$_4sz>y3x^R7n4ED!5o<f!284U3o`_8>XL3@5**h<Hcp
z@=-jpH@#|<>(xr%Hv)_gILarO46q+MaDOF%ChaymKoI6JU5Pg;7#2n9-18|S1;AK+
zgsn6;k6-%!QD>D?cFy}8F;r@z8H9xN1jsOBw2vQONVqBVEbkiNUqgw~*!^##ht>w0
zUOykwH=$LwX<q*Afk5R&Mctbiz>2j&nLy=@{hr)2O&-wm-NyjW7n~Zs9UlH;P7iP3
zI}S(r0YFVYacnKH(+{*)Tbw)@;6>%=&Th=+Z6NHo_tR|JCI8TJiXv2N7ei7M^Q+RM
z?9o`meH$5Yi;@9XaNR#jIK^&{N|DYNNbtdb)XW1Lv2k{E>;?F`#Pq|&_;gm~&~Zc9
zf+6ZE%{x4|{YdtE?a^gKyzr}dA>OxQv+pq|@IXL%WS0CiX!V<r8QLM#*MRM`MfrL^
z$oozeKu(Nq#u9g*IQ%|9o}%#$^xUC(KN(HGggqLu?YF|WP9UQsZcqciD65u58u(o>
zm$fCePA%lU{%pTKD7|5NJHeXg=I0jL@$tOF@K*MI$)f?om)D63K*M|r`gb9edD1~Y
zc|w7N)Y%do7=0{RC|AziW7#am$)9jciRJ?IWl9PE{G3U+$%FcyKs_0Cgq`=K3@ttV
z9g;M!3z~f_?P%y3-ph%vBM<NK?r_G3UHy@sF~h!`(w;SXKRHdJ%HcvAvAAT4Qk5qo
zMgavqbI6bm$F8YQRbu-Q60TKKDjBrG#E!{k)-_O9;f|9i`Bf)1frR1W)S8zwM~^w3
zgTV=3ki=7ABU#jjo~7zOCe&Y02bU{vhUnu>eS@p7P&Ea8M@97+%XEj*(1E6vHj==d
zjsoviB>j^$_^OI_DEPvFkVo(BGRo%cJeD){6Uckei=~1}>sp299|IRjhXe)%?uP0I
zF5+>?0#Ye}T^Y$u_rc4=lPcq4K^D(TZG-w30-YiEM=dcK+4#o*>lJ8&JLi+3UcpZk
z!^?95S^C0ja^jwP`|{<+3cBVo<?ZqT?*63G^-kLfa79`_!t|3XN?#4oHPT!4lKDlS
z&|`dJ%anWz)cD{Izk)|S%W;K%rEUv+1C{y)t{{-Ax56UAAwT>g$(mRdQmadS+Vh~z
zS@|P}=|z3P6uS+&@QsMp0no9Od&27O&14zHXGAOEy<!&qoA;BoYe5Gd6XaoKZz3O>
zh~OKpymK5C%;LLb467@KgIiVwYbYd6wFxI{0-~MOGf<ue$0Kq0FKpj=H%&N{0wz|#
zv3H@VVff^)dR)T~U^4qB#5GIMnxWTKM_`%1WhbW1RX5wx$kbFST`O+(C#(QYZ1qYr
zH@an#>Tq$nBTB!{SrW<fHPfZ<Irz+G=%+OcFrK=FGzu_OrmZYz+$?F}3ABX2OV4Ts
zsD|%iq->mL9H<Tr^2xz>s}C&l&l#m?s*{tA?BHS4mVKHAVMqm63H<|c5n0~k)-kbg
zXidai&9ZUy0~WFYYKT;oe~rytRk?)r8bptITsWj(@HLI;@=v5|XUnSls7$uaxFRL+
zRVMGuL3w}NbV1`^=Pw*0?>bm8+xfeY(1PikW*PB>>Tq(FR`91N0c2&>lL2sZo5=VD
zQY{>7dh_TX98L2)n{2OV=T10~*YzX27i2Q7W<Ntl33%|cp7@_XQ%`!?JFZGy3th+(
z9`69=1diKn`u=0X>86M4$?gZIXZaBq#sA*{PH8){|GUi;oM>e?ua7eF4WFuFYZSG|
zze?srg|5Ti8Og{<A|-y4P^Vw-HZz`B)6iIj60J8RmoI9z56$O?KklBRh#A8wwXksP
zIQ{KLcY4jo=L=|_hbacrV%Qq6!Kf@BT^Q2N;#Sl~J=F}P(ian;6LK=Pia-a<t*`EG
zsvh#5MX1PG_H?pP{~kcN#Yl5&$-{v%{fm#~)VR&aYV*QjB+l!bVIL2ZIK*(o)mg>O
zeFx<XJQO~(UxB;12D)?%fz2kHQ0)}w{#l!~t+-NWg^{L<(tn&kN>uw9!U+zhyk?@w
zjsA6(oKD=Ka;A>Ca)oPORxK+kxH#O@<!C?nm{!PyX#FIJ5Fce^7Glx51z4q!IF-9T
z(}u{s9F?k?->zhC!!XS4@=swnuMk>t+JmLmFiE^1aX3f<)D@`%K0FGK^gg1a1j>zi
z2KhV>sjU7AX3F$SEqrXSC}fRx64GDoc%!u2Yag68Lw@w9v;xOONf@o)Lc|Uh3<2<E
zaTlN?EK~WL>1ctTYu-mFZuHk*+R{GjXHIGq3p)tFtQp%TYqD=j1&y)>@zxoxUJ!G@
zgI0XKmP6MNzw>n<q>RxK$-Gbzs}dyfFzt>#5;f6oR27ql!%+{tr+(`(>%51|k`ML}
zY4eE)Lxq|JMas(;JibNQds1bUB&r}ydMQXBY4x(^&fY_&LlQC)3hylc$~8&~|06-D
z#T+%66rYbHX%^KuqJED_wuGB+=h`nWA!>1n0)3wZrBG3%`b^Ozv6__dNa@%V14|!D
zQ?o$z5u0^8`giv%qE!B<jmp7|q6krbi_G>zZ!3j;BlDlJDk)h@9{nSQeEk!z9RGW)
z${RSF3phEM*ce*>Xdp}585vj$|40=&S{S-GTiE?Op*vY&Lvr9}BO$XWy80IF+6@%n
z5*2ueT_g@ofP#u5pxb7n*fv^Xtt7&?SRc{*2Ka-*!BuOpf}neHGCiHy$@Ka1^Dint
z;DkmIL$-e)rj4o2WQV%Gy;Xg(_Bh#qeOsTM2f@KEe~4kJ8kNLQ+;(!j^b<yk)2Ga*
z`Da!i<uGd>gJMcNhvklP5Z6I+9Fq@c&D~8Fb-4rmDT!MB5QC{Dsb;BharP*O;SF4&
zc$wj-7Oep7#$WZN!1nznc@Vb<_Dn%ga-O#J(l=OGB`dy=Sy&$(5<R7(thvp%XRU@s
zvD!RD|Ap4-iUR15Zc?p`W5PfYcwl?pqP=!?Ly8YQJV-_=LA<5F14$ueWH9bhJ%_)w
z7V5=v(sMJKH%(v>-n3zzu%d7E#^8`T@}V+5B;PP8J14#4cCPw-SQTdGa2gWL0*zKM
z#DfSXs_iWOMt<QB?xsXtvjwXo?shW#x+{vW<m&Lb0}Ev3ll-+Cv)H2yx72H2vfbao
z)&}#dlu-#QrCe#mI_dwQZ8aV{yR-kuQpUpp0FeFvxZ;1G7pk86VlScc8cAV!@aPt-
zLbAEaXYm_LG-m+FWTqvpGKKfn>)0*+Y>Lkd=LlyoHjublNLefhKBv@JoC>P7N1_#>
zv=mLWe96%EY;!ZGSQDbZ<UL<`wO?;KrMew|zF)HM0NF!*C)o2Xb2C86^s8tmic{Un
z9|@ov+&qEN=O7wL#??)8qe;19z|E|XhPC!>Wb#;tzqAGgx~uk+-$+2_8U`!ypbwXl
z^2E-FkM1?lY@yt8=J3%QK+xaZ6ok=-y%=KXCD^0r!5vUneW>95PzCkOPO*t}p$;->
ze5j-BLT_;)cZQzR2CEsm@rU7GZfFtdp*a|g4wDr%8?2QkIGasRfDWT-Dvy*U{?IHT
z*}wGnzdlSptl#ZF^sf)KT|BJs&kLG91^A6ls{CzFprZ6-Y!V0Xysh%9p%iMd7HLsS
zN+^Un$<a&ma`v<=_o?VGrwUGJw=O>tDV)T@i!v?3o0Fsx2qI(AX_$dDkBzQ@fRM%n
zRXk6hb9Py#JXUs+7)w@eo;g%QQ95Yq!K_<hHRNS7N*hWtqjDKgW@A%kX02U4KOU=O
zvdAz#;kT}}XkJ!QzU;bHk8JAq+{_%?pw^sYL|x|PeydT9?IGU9Y51^30i-q1#6m%s
zrcB|gv?mw<4R{=sU0@i6UC;{u0I&8wO=u?6r+b>d=z{0dGS+pToEI6=Bo8+{k$7&Z
zo4>PH(`ce8E-Ps&uv`NQ;U$%t;w~|@E3WVOCi~R4oj5wP?%<*1C%}Jq%a^q~T7u>K
zML5AKfQDv6>PuT`{SrKHRAF+^&edg6+5R_#H?Lz3iGoWo#PCEd0DS;)2U({{X#zU^
zw_xv{4x7|t!S)>44J;KfA|DC?;uQ($l+5Vp7oeqf7{GBF9356nx|&B~gs+@N^gSdd
zvb*>&W)|u#F{Z_b`f#GV<S^Bd2~Pyg*5%eHlTUz}@u5PV*7l^~{G24{Qqrx`@++o~
ztboMW3urCbjTB~&;i*a|(eC0qz31>tQ`pYv3#||N{xj1NgB<#=Odt6{eB%#9RLt5v
zIi|0u70`#ai}9fJjKv7dE!9ZrOIX!3{$z_K5FBd-Kp-&e4(J$LD-)NMTp^_pB`RT;
zftVVlK2g@+1Ahv2$D){@Y#cL#dUj<nH(n~Edj4!|Skt}P+Crb$TxBzD_v2O|_fXDf
zyOhDlptC3q?wEW8BD4DYDy}&OXN4=Gin3Clovb(?fZbl&a4@HKR2*IMYDM~#=eox}
zr@@VgW<o#eD*<OYTh-Dp*Y9Q~ulW+qlsH#Z{CRf%{8T(JHO1!sg=2L#MeC>9*&%#6
zd2m9{1NYp>)6=oAvqdCn5#cx{AJ%S8skUgMglu2*IAtd+z1>B&`MuEAS(D(<6X#Lj
z?f4CFx$)M&$=7*>9v1ER4b6!SIz-m0e{o0BfkySREchp?WdVPpQCh!q$t>?rL!&Jg
zd#heM;&~A}VEm8Dvy&P|J*eAV&w!&Nx6HFV&B8jJFVTmgLaswn!cx$&%JbTsloz!3
zMEz1d`k==`Ueub_JAy_&`!ogbwx27^ZXgFNAbx=g_I~5nO^r)}&myw~+yY*cJl4$I
znNJ32M&K=0(2Dj_>@39`3=FX!v3nZHno_@q^!y}%(yw0PqOo=);6Y@&ylVe>nMOZ~
zd>j#QQSBn3oaWd;qy<AH3+eYXyF}9Xqs&`j)Js;7`deezzO@(if{@wtUbaD%FKTU}
z5w@ZwEG`RDwK>$&5(5H$Ayi)0haAYO6TH<z?6tyk$+6-5SvI&DI1q3_)(4fdZ5Se9
zBbX2Qt9$@_(SU-uL9$`(89L9b^PH`sRc(S;t{a+9w+wmDT>>FR?rhqHmNOO+(})NB
zLI@B@v0)eq!ug`>G<@htRlp3n!EpU|n+G+AvXFrWSUsLMBfL*ZB`CRsIVHNTR&b?K
zxBg<HRwQH-Pd9_*;+0`Ns@&d6=NP#dv8(oIe;Q1jESZF+juys7ECR&=R-98_-67uO
z3$~aVQBexDk*n5GG0IbgeygBsp6J9Ak`^z@J>sN0BjfB>UVcJ|x%=-zb%OV7lmZc&
zxiupadZVF7)6QuhoY;;FK2b*qL0J-Rn-8!X4ZY$-ZSUXV5DFd7`T41c(#lAeLMoeT
z4%g655v@7AqT!i@)Edt5JMbN(=Q-6{=L4iG8RA%}w;&pKmtWvI4?G9pVRp|RTw`g0
zD5c12B&A2&P6Ng~8WM2eIW<Jfbv|J{U>=wxd?r7A*N+&!Be7PX3s|7~z=APxm=A?5
z<Ct?-npDR`F>t>xB4WG|*Td@VX{Rs)PV0|yK`oI3^xn(4c_j&vgxk_Y3o(-`_5o`V
zRTghg6%l@(qodXN;dB#+OKJEEvhfcnc#BeO2|E(5df-!fKDZ!%9!^BJ_4)9P+9Dq5
zK1=(v?KmIp34r?z{NEWnLB3Px{XYwy-akun4F7xTRr2^zeYW{gcK9)>aJDdU5;w5@
zak=<+-PLH-|04pelTb%ULpuuuJC7DgyT@D|p{!V!0v3KpDnRjANN12q6SUR3mb9<-
z>2r~IApQGhst<D{{Vf5G$!J9FyJ-E-*A*EoNl_C#=MT@p=Xle}_jo(=^L>Z!3*?5V
z8#)hJ0TdZ<kpQa~V_Tj9(@ze|2#~^ENp?G7Jt@Eflo`qt*qnbcmXouacBm8O7C@Os
z{Du2beNd5?Za)HL!ZE%zpwg!kyVuKIF9N=(m23`w*$5>g0M-BK#nGFP>$i=qk82DO
z7h;Ft!D5E15OgW)&%lej*?^1~2=*Z5$2VX>V{x8SC+{i10BbtUk9@I#Vi&hX)q<DD
zB<)Sw)<~oUy)n6wE>Q!LwySI{Bnv%Sm)yh{^sSVJ8&h_D-BJ_YZe5eCaAWU9b$O2c
z$T|{vWVRtOL!xC0DTc(Qbe`ItNtt5hr<)VijD0{U;T#bUEp381_y`%ZIav?kuY<v6
zX67v2C6cbIOG)5k!|qC-WsWgOfACm-q$QibFt!z9&vuM4Ra<@t5?aicE~iV+3AvjG
zIg1RVRV7=ipka+$YiU^iebt34R#X_ZP(5j+8#<1x%dt8dn8LWW*;+`tjJbED5GP+(
z;WzH$-`*O}!b)z&?E7%4&3EtV-<sTj?CD<=L+<P?A5!5CSPGi)w4A<JPgzq;6rR*O
zXNdyY$eTaKl$~z~drmdabQ@3giDtf2>G{iyYdEBPW=*xNSc;Rlt6~F4M`5G+VtOjc
z*0qGzCb@gME5udTjJA-9O<&TWd~}ysBd(eVT1-H82-doyH9RST)|+Pb{o*;$j9Tjs
zhU!IlsPsj8=(x3bAKJTopW3^6AKROHR^7wZ185wJGVhA~hEc|LP;k7NEz-@4p5o}F
z`AD6naG3(n=NF9HTH81=F+Q|JOz$7wm9I<+#BSmB@o_cLt2GkW9|?7mM;r!JZp89l
zbo!Hp8=n!XH1{GwaDU+k)pGp`C|cXkCU5%vcH)+v@0eK>%7gWxmuMu9YLlChA|_D@
zi#5zovN_!a-0?~pUV-Rj*1P)KwdU-LguR>YM&*Nen+ln8Q$?WFCJg%DY%K}2!!1FE
zDv-A%Cbwo^p(lzac&_TZ-l#9kq`mhLcY3h9ZTUVCM(Ad&=EriQY5{jJv<5K&g|*Lk
zgV%ILnf1%8V2B0E&;Sp4sYbYOvvMebLwYwzkRQ#F8GpTQq#uv=J`uaSJ34OW<hi?`
zP14gpnLmL&7H`p4L%8;nC1<^Sv9p;w<Wt?|_#g6*20U1pM3nHRfS>ITeSGo6+-8Xw
znCk*n{kdDEi)Hi&u^)~cs@iyCkFWB2SWZU|Uc%^43ZIZQ-vWNExCCtDW<BUzywAz*
z=(vxHv4d&65KOllAq-#$@U{@M^Tie>jqHs;;tWf$v{}0{p0Rvxkq``)*>+Akq%|Na
zA`@~-Vfe|+(AIlqru+7Ceh4nsVmO9p9jc8}HX^W&ViBDXT+uXbT#R#idPn&L>+#b6
zflC-4C5-X;kUnR~L>PSLh*gvL68}RBsu#2l`s_9KjUWRhiqF`j)`y`2`YU(>3bdBj
z?>iyjEhe-~$^I5!nn%B6Wh+I`FvLNv<KrLHuL|CB_`07?lkcY;`F}7N|9w?h$j;W(
z!pz0d;6Gc;=tP?z1|!0VS^mTNfuvL}h&K?b1^iwS6ciDpxQaBY5Gc}49BtNL@wSAH
zN-`fR84|MY8{n7xC}ub4B$LcEGUf*6``pjVtH+rgy&k|kpb4%YlJ~9w&{2Xuzeu1M
zq`UMUPdX@*+$axeLs?$}*bD{+cnrR~Y#}m-O=_R~Wti_#iWT_s(=ymH^VTEl)dozx
zf?Q;WOl1sf3*~dyaUWrzpj(B{DD^$`<1{1iWu+66OaaANG(C3>auve~eX<+Ipl&04
zT}};W&1a3%W?dJ2=N#0t?e+aK+%t}5q%jSLvp3jZ%?&F}nOOWr>+{GFIa%wO_2`et
z=JzoRR~}iKuuR+azPI8;Gf9)z3kyA4EIOSl!sRR$DlW}0>&?Gb<F6G*f~S_Xmd?&<
zcTp7FM31gIFJU_kMTKVvYfdLV&qNi%10o_cXO}T8c0JA~S7IvYJW{2Mc@QfYQPg<B
zM^$g#zoTZ3_m+CrHFauLo}15?s=HP)?JB{H_0#&&1l#xC0PUJEil&(!l3&4$4Oabl
z(t*+m#j)cGDV4roRR~6gh^^UTE<ORsZfX<yztwQw%!x#Q2cf-H-Ei*R_oEBu0*M}r
zaR*fDOfo;PPv!PbT7OdxPFjDUG&0BrIox?s;EQMl0XBMs85AAF!I(xegz)j_*&}F&
zVxM4&whWS?c~-!t@$rAV{-U7+LEraxy0yVT-$%W;DztTaLwSHk;hmJtJCfzd$8ZUU
zM49WF9Y$VtKqVmyl%^86>gPojmj<IO9KHY)gcrh=qY_}jG!}())PpS;BXBA!e*hSR
zilZbQ&4Xd81)(e#05gdbS)_Rc7=w(fM<O8%<WUPqvy2OZsgKBL!XxkiWU2;{7$;C6
z9R+3;R|H$*pUT7|00m@1wlw|z2Pi1^Q3j9tQwHGtFdr%Y_fp{BLtn(*#K`48rPtM-
zeUXnbzjJ6`4-eFtz^q{qhyCKLVL%|Li&oS2mxY?F!w9Q6rOe*>mnln;cTqCt=ADbE
zZ8GAnoM+S1(5$i8^O4t`ue;vO4i}z0wz-QEIVe5_u03;}-!G1NyY8;h^}y;tzY}i5
zqQr#Ur3Fy8sSa$Q0ys+f`!`+>9WbvU_I`Sj;$4{S>O3?#inLHCrtLy~!s#WXV=oVP
zeE93*Nc`PBi4q@%Ao$x4lw9vLHM!6mn3-b_cebF|n-2vt-zYVF_&sDE--J-P;2WHo
z+@n2areE0o$LjvjlV2X7ZU@j+`{*8zq`JR3gKF#EW|#+{nMyo-a>nFFTg&vhyT=b}
zDa8+v0(Dgx0yRL@ZXOYIlV<CBxH&myw-{Mgw|3Z>SZ0|MFizy0VPW8;AfA5|pe!#j
zX}Py^8fl5SyS4g1WSKKtnyP+_PoOwMMw<ZOz9;D51vwfT?(7P{J9uC+df4xbrr2zV
zB?xsPrQn{*Mv;KOgSS&5@+LuXkea1)Zq>u`(i@Z)diJp~U54*-miOchy7Z35eL>^M
z4p<-aIxH4VUZgS783@H%M7P9hX>t{|<kmOhY+3PLOlAj^>RU7$n4T(brCG#h9e9p!
z+o`i;EGGq3&pF;~5V~eBD}lC)>if$w%Vf}AFxGqO88|ApfHf&Bvu+xdG)@vuF}Yvk
z)o;~k-%+0K0g+L`Wal<EEr#pT9&cB!85zTR)doGHYQA;Y4iG{j=~O<Gh^(9@<v8&o
z)RDtDdQW7hx3ZX>a!$=ZV|z$e%>f0%XoLib%)!R^RoS+{!#X?h-<kGFCJU+*P>6uu
zF&&KxORdZU&EwQFITIRLo(7TA3W}y6X{?Y%y2j0It!ekU#<)$qghZtpcS>L3uh`Uj
z7GY;6f$9qKynP#oS3$$a{p^{D+0oJQ71`1?OAn_m8)UGZmj3l*ZI)`V-a>MKGGFG<
z&^jg#Ok%(hhm>hSrZ5;Qga4u(?^i>GiW_j9%_7M>j(^|Om$#{k+^*UL<NK}BVp#gd
zBD%KcbS)b{|CXjYx_P3_eGPFMMz1_Nk540?Us_HPBMy;cERLy0SxfOpX5xzV&cl#)
zt&&6pjk~F}sDOyA9s+XeyTf%9%I=S3nCcDp2Af;QpT#R>nEgzW_1gCICtAD^WpC`A
z{9&DXkG#01Xo)U$OC(L5Y$DQ|Q4C6CjUKk1UkPj$nXH##J{c8e#K|&{mA*;b$r0E4
zUNo0jthwA(c&N1l=PEe8Rw_8cEl|-eya9z&H3#n`B$t#+aJ03RFMzrV@gowbe8v(c
zIFM60^0&lCFO10NU4w@|61xiZ4CVXeaKjd;d?sv<gv6;u6elr3xr~p;CLrK1=+ZBw
z$Y<W|q#kt(G{*D&Qkw-trQSG}>52XM*lS8XiVjgWpRB;&U_C0g+`6B5V&w|O6B*_q
zsATxL!M}+$He)1eOWECce#eS@2n^xhlB4<_Nn?yCVEQWDs(r`|@2GqLe<#(|&P0U?
z$7V5IgpWf09uIf_RazRwC?qEqRaHyL?iiS05UiGesJy%^>-C{{ypTBI&B0-iUYhk>
zIk<5xpsuV@g|z(AZD+C-;A!fTG=df1=<%nxy(a(IS+U{ME4ZbDEBtcD_3V=icT6*_
z)>|J<Y(kIYsG`z6gyX&}qOiN*?9OL086m5X{hq6Ig4#W@iNENBRsw2^%kU7#L2|pp
zfdZ~o%7N|AM$3+2Q82nCBw2dK>?>&6%nvHhZERBtjK+s4xnut*@>G<VN!iYC0JC0F
z7C4lQZ~9^GNSctWumcZ#1X037wz24bZkA{*jo3r`%UXDS^K_+8hV8{gw8t#vVSJ;%
z9c?Ez0!rvl#uwpap|4<*d9UuKSjWn24OFIi&rE}!=sVnu59lQ~@4HIl&h;AmLia?2
zUL-?{m1bz0QDnL&$JD)qE4*iTL#%6dSw8A41Gt4doXWr-`$rleCkVKi0#mfRM!)mY
zIRoubkmw30NIQhtCJYLo7$LOA<y9EL8N*i`%g_PIUD8SHni$er{_LTTN*Wqfx<buS
zb$(_9;wX-c*`xTSvy6C@PDNyy2YoKV;`dWQKiLwa26g^kXh`=t6PlPNT~Q9So~U*X
z3nx6eVXazyi3=nJQw6@jVna;b;RTqKnF0f_=;<}6<0^@)YUgQHPBXXoP$FjaOB^=t
zP%99lNT=pyPA&53Wj%hQT>AmA5m*OTp$!^CHTr}vM4n(X1Q*;{e-Rd2BCF-u@1ZGm
z!S8hJ6L=Gl4T_SDa7Xx|-{4mxveJg=ctf`BJ*fy!yF6Dz&?w(Q_6B}WQVtNI!BVBC
zKfX<>7vd6C96}XAQmF-Jd?1Q4eTfRB3q7hCh0f!(JkdWT5<{iAE#dKy*Jxq&3a1@~
z8C||Dn2mFNyrUV|<-)C^_y7@8c2Fz+2jrae9deBDu;U}tJ{^xAdxCD248(k;dCJ%o
z`y3sADe>U%s<JWQeHbE;y_*tD>uxwwv~8A1+R$VB=Q?%U?4joI$um;aH+eCrBqpn-
z%79D_7rb;R-;-9RTrwi9dPlg8&@tfWhhZ(Vx<DUpdj8XcHW`q{6yqiIzcmGmhsxE(
z@-zez1_>&1PQ+6(huX`;M9x~LrW~~#3{j0Bh2kDU$}@!fFQej4VGkJv?M4rU^x!RU
zEwhu$!CA_iDjFjrJa`aocySDX16?~;+wgav;}Zut6Mg%C4><PTsD!{kIiIRy9=1Aw
zY;M8Eqj=FH#bx<r<6@cBrQ0UMw6e8^v|*8L6vZKlp_PoKF*td|-B1-bh(bXl;KGoy
ze|2jEKeeu5MGO@KpjsEha>}8FL?8)Kgwc(Qlj{@#2Pt0?G`$h7<q&K~4OS{ORv@L7
z>P#M+qoXtlV@d}%c&OzO+QYKK`kyXaK{U(O^2DyIXCZlNQjt0^8~8JzNGrIxhj}}M
z&~QZlbx%t;MJ(Vux;2tgNKGlAqphLq%pd}JG9uoVHUo?|hN{pLQ6Em%r*+7t^<);X
zm~6=qChlNAVXNN*Sow->*4;}T;l;D1I-5T{Bif@4_}=>l`tK;qqDdt5zvisCKhMAH
z#r}`)7VW?LZqfdmXQ%zo5bJ00{Xb9^YKrk0Nf|oIW*K@(=`o2Vndz}ZDyk{!u}PVx
zzd--+_WC*U{~DH3{?GI64IB+@On&@9X>EUAo&L+G{L^dozaI4C3G#2wr~hseW@K&g
zKWs{uHu-9Je!3;4pE>eBltKUXb^*hG8I&413)$J&{D4N%7PcloU6bn%jPxJyQL?g*
z9g+YFFEDiE`8rW^laCNzQmi7CTnPfwyg3VDHRAl>h=In6jeaVOP@!-CP60j3+#vpL
zEYmh_oP0{-gTe7Or`L6x)6w?77QVi~<VDx`fw;L`VTJ3A_($%0y%60sa5-^3a6v=d
zmmak>jD8lWN@3RHcm80iV%M1A!+Y6iHM)05iC64tb$X2lV_%Txk@0l^hZqi^%Z?#-
zE;LE0uFx)R08_S-#(wC=dS&}vj6P4>5ZWjhthP=*Hht&TdLtKDR;rXEX4*z0h74FA
zMCINqrh3Vq;s%3MC1YL`{WjIAPk<IG3Wg4CtfDQ*vr2eaPwC^O8I68!!&nV4u+r_F
z?Axith|qN&KZ99L>VL#3rj^9Pj9Ss7>7duy!9H0vYF%>1jh)EPqvlr6h%R%CxDsk|
z!BACz7E%j?bm=pH6Eaw{+suniuY7C9Ut~1cWfOX9KW9=H><&kQlinPV3h9R>3nJvK
z4L9(DRM=x;R&d#a@oFY7mB|m8h4692U5eYfcw|QKwqRsshN(q^v$4$)HgPpAJDJ`I
zkqj<O$?%~S@(l(Nhxp_sGA`$A%xJ7kG%+@Mg|5Rt6m|$*ZUs_O&tJj;*GHA8ccUky
ztdHVq5%mDvVz0+qo6-yO?&N>q(8Cd!K!+wCd=d@w%~e$=gdUgD&wj$LQ1r>-E=O@c
ze+Z$x{>6(JA-fNVr)X;*)40Eym1TtUZI1Pwwx1hUi+G1Jlk~vCYeXMNYtr)1?qwyg
zsX_e*$h?380O0<gk^3K^_@6N5|2rtFRkhT9jP1T;nZ|k<{vtt&=cCpw1{DoTNi|6*
zNR~&3M3w}sVsT4{Fd&%jPlD{py<BN_zia9hI9Ip7U3}jPq_+H)r9(in7-!PpJihq-
zw0+F|?s|8=Bj*cv!`7|95cO>0ou?0R@7-Fc59o$UvyVs4cUbujHUA>sH!}L54>`e`
zHUx#Q+Hn&Og#YVOuo*niy*GU3rH;%f``nk#NN5-xrZ34NeH$l`4@t);4(+0|Z#I>Y
z)~Kzs#exIAaf--65L0U<!Yaeav3)qH(`Lb>HT_SvV8O2WYeD>Mq^Y6L!Xu8%vnp<f
zF-ML?EA-QLj_KdFHPDT9@{&CgOfV=>ofG@w!}R7M28?i1*T&zp3X4^OMCY6(Dg<-!
zXmcGQrRgHXGYre7GfTJ)rhl|rs%abKT_Nt24_Q``XH{88NVPW+`x4ZdrMuO0iZ0g`
z%p}y};~T5gbb9SeL8BSc`SO#ixC$@QhXxZ=B}L`tP}&k?1oSPS=4%{UOHe0<_XWln
zwbl5cn(j-qK`)vGHY5B5C|QZd5)W7c@{bNVXqJ!<MH|d3P$j9&VqkPfJu|wcu=-=7
zLO~2}`PnP-On3_NOs4{hJ&4M7x*M^%g^_s4zus|ykus<=xkIi<3#(~DK73KtIuaza
zq3Ok{j4$g8v7e>!n$^ufc?N9C-BF2QK1(kv++h!>$QbAjq)_b$$PcJdV+F7hz0Hu@
zqj+}m0qn{t^tD3DfBb~0B36|Q`bs*xs|$i^G4uNUEBl4g;op-;Wl~iThgga?+dL7s
zUP(8lMO?g{GcYpDS{NM!UA8Hco?#}eNEioRBHy4`mq!Pd-9@-97|k$hpEX>xoX+dY
zDr$wfm^P&}Wu{!%?)U_(%Mn79$(ywvu*kJ9r4u|MyYLI_67U7%6Gd_vb##Nerf@>&
z8W11z$$~xEZt$dPG}+*IZky+os5Ju2eRi;1=rUEeIn>t-AzC_IGM-<V%6qUamagiO
zojXi&7L8*IWlJ}@8}`JxyIBN$u|oRzm@w!)u;`JJ^U^Jm{ZDgyeTstN3t7NGnWGqQ
z+EIa8gC_h)Zo3JN!q<7m%o03s)htD&NG?lXEop9Gx?#VaLBB3SgcFmh3F=U430hIe
z6>IXWK3^6QNU+2pe=MBn4I*R@A%-iLD<B3fBYdI`-^xCP#WQb@1Qb6Wc1|7$rrI$0
zS^}=1l87G|X!N)P#&2-ZEFApzIK5kn5Gfb61a_<ma9;3$9f;mz8FokB;4w(Y@!^ya
zu;TjxPaQyO7n{FcIlqEr<3P?P4i)3rOGc5I4};xC;qQa&0^@jzv_HUBAQxZ^AEFm5
zBTlS@?>COHTE-O^wo$sL_h{dcPl=^muAQb`_BRm};=cy{qSkui;`WSsj9%c^+bIDQ
z0`_?KX0<-=o!t{u(Ln)v><gH1Bl$-3LHEdi^mWSpxtdQaHDvah(~iGD|9egFyL#F~
z?1$GP^^-sUm)!YZ{+<LJ&0K7L{O*24r%mkt6Kzb6pOOS-L<yFAV=ioJ*0iBM>%VGL
z0pC=GB7*AQ?N7N{ut*a%MH-tdtNmNC+Yf$|KS)BW(g<Pdkm%)j?It(+K5~xj$IK!{
zp+6C1gYJS33v`?Xo$~~77W&2eyGU19<m6FlNMw~43kikpZyKWVZ@N_*wAeJPS%sqH
z40>QJ*z$d{+{j?(e&hgTy^2|AR9vx1Xre2fagGv0YXWqtNkg*v%40v?BJBt|f9wX5
z{QTlCM}b-0{mV?IG>TW_BdviUKhtosrBqdfq&Frdz>cF~yK{P@(w{Vr7z2qKFwLhc
zQuogKO@~YwyS9%+d-zD7mJG~@?EFJLSn!a&mhE5$_4xBl&6QHMzL?CdzEnC~C3$X@
zvY!{_GR06ep5;<#cKCSJ%srxX=+pn?ywDwtJ2{TV;0DKBO2t++B(tIO4)Wh`rD13P
z4fE$#%zkd=UzOB<aY_AGMe|>7<sX$yw1SM(554I3!t(H9Z3X!Z5et+k4_h&Thynx!
ziTh5;c|GaYsH@W32G0xdhr&KvFp@Nsj=Jm7RQGd8dhSlG9l$e(+pLSdq<w-kZ7W-l
z4}DfW=)F=&(6?c$=|K`W>4gi=-*CuID&Z3zI^-`4<B}t|X$V`AU_-K%EPFL_9twl_
zImK{&j6sLpH7WP2;B>U^S?dHxK8fP*;fE|a(KYMgMUo`T<LMf=xb>HIS1f!*6dOI2
zFjC3<eBkTsS?s~jirYF@Nrja2AilB1Grgok(Q{J!-yMdCbS>O=-AL`<v=HnY;qaP=
z%r%pyN;W|G{!13k5HgL{&1MZLLmT$ii@iPy4pvmSTAaNGh_&&=IOx}7|G?LkOre&5
ze$)ZX{wLMvAK$Ose+l($RV_DU6^yOKl5CcA-LOWBeC<Ob3qkCr#=PoHO}Zi7*=4i{
zhy`P5@RD?fbbG{Ww-4~nmy*sK0y=*cjfuaB@ZGQIADDEhtuw}4>6=9pp;`CYPTdVX
z8(*?V&%QoipuH0>WKlL8<OkjufLT@|_$itWfOgQQ1sL1my9jh5H&Aqu0?B`H1h6nM
zGosuE%;~qrp)5qiJt5TkvuY!P5&J7R#=`qhgmgE%$-tyU1wv>A*zTKckD!paN@~hh
zmXzm~qZhMGV<pYA7aBO1=rl8ewvtPYii`7)>dQGd=AG8&20HW0RGV8X{$9LldFZYm
zE?}`Q3i?xJRz43S?VFMmqRyvWaS#(~Lempg9nTM$EFDP(Gzx#$r)W&lpFKqc<y(GB
zQ)iBAS`N=DS_sKSXI55P(lHkwH)@Q89oTUc{-vd@Ue^>AoJh-AxEw$-bjW>`_+gEi
z2w`99#UbFZGiQjS8kj~@PGqpsPX`T{YO<m!OQBo2H4HfqK(14BF?XJ?$*LTUG|=XE
z%mXZ(W0fCU1)eodty#XEHD<Wgj8lxa(h;^9fW-UTt2UUeP&QC*>j`CaEqTFag;$jY
z8_{Wzz>HXx&G*Dx<5skhpETxIdhKH?DtY@b9l8$l?UkM#J-Snmts7bd7xayKTFJ(u
zyAT&@6cAYcs{PBfpqZa%sxhJ5nSZBPji?Zlf&}#L?t)vC4X5VLp%~fz2Sx<*oN<7`
z?ge=k<=X7r<~F7Tvp9#HB{!mA!QWBOf%EiSJ6KIF8QZNjg&x~-%e*tflL(ji_S^sO
ztmib1rp09uon}RcsFi#k)oLs@$?vs(i>5k3YN%$T(5Or(TZ5JW9mA6mIMD08=749$
z!d+l*iu{Il7^Yu}H;lgw=En1sJpCKPSqTCHy4(f&NPelr31^*l%KHq^QE>z>Ks_bH
zjbD?({~8Din7IvZeJ>8Ey=e;I?thpzD=zE5UHeO|neioJwG;IyLk?xOz(yO&0DTU~
z^#)xcs|s>Flgmp;SmYJ4g(|HMu3v7#<SE)AQQ4Qptn#EiMmi^p+Ei-7DkP+HtEnTf
z=ihEK*Qz1Ztg&vmf~iSIJvy;UM*1)`@_lXyy`^7!LwVESw8;X~PDDY`x##uAQg`Ks
z=exD#_B;<%p^vKWmo{iCKEmMLveyeSGEVy6BOKJM`)TA4((F&!tIH99l|b!Je=-ox
zTnV0#B=>;c*Aa8iF#UZo7CvDq4>8#qLJ|YdZ!AsH%^_7N1IQjCro<P>K7UpUK$>l@
zw`1S}(D?mUXu_C{wupRS-jiX~w=Uqqhf|Vb3Cm9L=<ElBA0am3@5~_j4>T+w91Cu^
z*&Ty%sN?x*h~mJc4g~k{xD4ZmF%FXZNC;oVDwLZ_WvrnzY|{v8hc1nmx4^<U$9gKZ
zXD;2On@pVz(zumYHw-cDICc(jj*0Lh@n}B_NB#b3S3Y`joU*Hg4D^tTlnR`X)wKiE
z<1(Wo3^4=KAZ|hOq%hItOAv2Yuv6FZW5>}Z;yriXsAf+Lp+OFLbR!&Ox?x<j>ABwl
zu8w&|5pCxmu#$?Cv2_-Vghl2LZ6m7}VLEfR5o2Ou$x02uA-%QB2$c(c1rH3R9hesc
zfpn#oqpbKuVsdfV#cv@5pV4^f_!WS+F>SV6N0JQ9E!T90EX((_{bSSFv9ld%I0&}9
zH&Jd4MEX1e0iqDtq~h?DBrxQX1iI0lIs<|kB$Yrh&cpeK0-^K%=FBsCBT46@h<vzQ
zR*F0_2h6Z11Y9Zzju}{_b;!1TT<IfdPup&BfzJrm?bo16`)8Tm1upGj;JDjh>#<Oy
z8t{(&!50W|bIsS-1avP5+*F7gID<ta6$a=EvLN_Gn#i|E*V;GvV|e9HOQ9zf{;k4c
z6E1|)o(`{GoSr=usmv~(8ivQq9h)k@J&LDI;_p0b!?ZsmFktoKIgcIE+yq!s*%$%)
z#ay6sWeCZZ>yi!AyDq1V(#V}^;{{V<B^hU0(%wtueKZDT`@J-_3mSLDBmaq~d|XD<
z7XM`Dzdz4EMpggFBJu`~KkDTFp@A11CGaoLc9C!MrY0!YzwKdGfx7t=5D@|7VVCk+
z^B@Uld)n>*@T4WJ&U-NTq43w=|K>z8%pr_nC>%C(Wa_l78Ufib$r8Od)IIN=u>417
z`Hl{9A$mI5A(;+-Q&$F&h-@;NR>Z<2U;Y21>>Z;s@0V@SbkMQQj%_;~+qTuQ?c|AV
zcWm3XZQHhP&R%QWarS%mJ!9R^&!_)*s(v+VR@I#QrAT}`17Y+l<`b-nvmDNW`De%y
zrwTZ9EJrj1AFA>B`1jYDow}~*dfPs}IZMO3=a{Fy#IOILc8F0;JS4x(k-NSpbN@qM
z`@aE_e}5{!$v3+qVs7u?sOV(y@1Os*Fgu`fCW9=G@F_#VQ%xf$hj0~wnnP0$hFI+@
zkQj~v#V>xn)u??YutKsX><O0LtJ*CTAYt%cbdwrkH)-u>pxKCl^p!C-o?+9;!Nug^
z{rP!|+KsP5%uF;ZCa5F;O^9TGac=<e#17!Ngq|n{jbexb$Js+_Pf5VvAs8ZxqWBs8
zB0&S13$r1<F)VBk$e5stmC}hMzOSHBA0t(kR!@rbH|QU6*IH0=h|_OeT6wpDmdv23
z34f|!XhwEd(Kkc%FUYK@H{gz+bBn7dd5Fl+jfYh}4;N_qJ7#NlT2O+)R4Pxe>M|=V
z_H(PfkV1rz4jl?gJ(ArXMyWT4y(86d3`$iI4^l9`vLdZkzpznSd5Ikfrs8qcSy&>z
zTIZgWZGXw0n9ibQxYWE@gI0(3#KA-dAdPcsL_|hg2@~C!VZDM}5;v_Nykfq!*@*Zf
zE_wVgx82GMDryKO{U{D>vSzSc%B~|cjDQrt5BN=Ugpsf8H8f1lR4SGo#hCuXPL;QQ
z#~<Fi-k$qL|7RVJ1Mm1Ag<$gB0(}Grl3S(KpYI)5f?u3vC7#V;7XHhGB(-?~L6q0H
z3n(8fq$!!dl{5-8`7Oj@C;&S?r8OD`wLCHxqX2ux!ard>b?C4MoepT3X`qdW2dNn&
z<Us;@%o6IHN`m_LE5@ycr7sZ5iN)2(z?4TB28{O!&JjxPf+H!xrjo)qWAjZifsc&}
zRUE<g)K;7gXjcN#UR5gfzb2nN2z_KhXjz-ToEUcM{^o{zAJg2QnR<7bsn(YUNIKF@
z%f>o8)K}%Lpu>0tQei+{<z4bzXqy$)s2?v=pRVAvTjJpopW)-K>>*VGErz|qjbK#9
zvtd8rcHplw%YyQCKR{kyo6fgg!)6tHUYT(L>B7er5)41iG`j$qe*kSh$fY!PehLcD
zWeKZHn<492B34*JUQh=CY1R~jT9Jt=k=jCU2=SL&&y5QI2uAG2?L8qd2U(^AW#{(x
zThSy=C#>k+QMo^7caQcpU?Qn}j-`s?1vXuzG#j8(A+RUAY})F@=r&F(8nI&HspAy4
z4>(M>hI9c7?DCW8rw6|23?qQMSq?*Vx?v30U%luBo)B-k2mkL)Ljk5xUha3pK>EEj
z@(;tH|M@xkuN?gsz;*bygizwYR!6=(Xgcg^>WlGtRYCozY<<HB2ZgQ)h*70uL|pZ2
z>rFX2E>kaZo)O<^J7a`MX8Pf`gBd4vrtD|qKn&B)C&wp0O-x*@-|m*0egT=-t@%dD
zgP2D+#WPptnc;_ugD6%zN}Z+X4=c61XNLb7L1gWd8;NHrBXwJ7s0ce#lWnnFUMTR&
z1_R9Fin4!d17d4jpKcfh?MKRxxQk$@)*hradH2$3)nyXep<KqaI3?gC#eK%i>5Z;B
z?yX+-Bd=TqO2!11?MDtG0n(*T^!CIiF@ZQymqq1wPM_X$Iu9-P=^}v7npvvPBu!d$
z7K?@CsA8H38+zjA@{;{kG)#AHME>Ix<711_iQ@WWMObXyVO)a&^qE1GqpP47Q|_AG
zP`(AD&r!V^MXQ^e+*n5~Lp9!B+#y3#f8J^5!iC@3Y@P`;FoUH{G*pj*q7MVV)29+j
z>BC`a|1@U_v%%o9VH_HsSnM`jZ-&CDvbiqDg)tQEnV>b%Ptm)T|1?TrpIl)Y$LnG_
zzKi5j2Fx^K^PG1=*?GhK;$(UCF-tM~^=Z*+Wp{FSuy7iHt9#4n(sUuH<I4zjuT^*g
zTOj)T0YzMUS}8lWAh=#M-<;W0su6sG+MC}XSqZj-`H_&HD?2Z|qE8QdIM(X#NffsX
zuwQ<4gm=;OFM%U76&;OT!|+5x?B#F>K??@v+6*|10Csdnyg9hAsC5_OrSL;jVkLlf
zHXIPukLqbhs~-*oa^gqgvtpgTk_7Gy<tuXYyQ=x)UZpuI%V@LXq4|I6hehHuRD*Qk
z+@3~62V_$Rc&ax*Fe`-_r5e~NV8Dh7^Qkc47_lIobqdmfrCP}{2YGKf1@Bh!U!R!l
zVh{a+_vh}x%?yACZT@@6M}$iwzkin{Cukrb?*D6_{O__PU~FPz|81A`Ki4JuH6?`4
zsEYmO+F8y*acunUpGD%Hp$-=5%jS}CI-%I;>pwH><53riYYL*M=Q@F-yEPLqQ&1Sc
zZB%w}T~RO|#jFjMWcKMZccxm-SL)s_ig?OC?y_~gLFj{n8D$J_Kw%{r0oB8?@dWzn
zB528d-wUBQzrrS<hDznyNCgL-qOb|p_nS%fSb5_Ze4V1&Bgk3Vp>SL<Uo&kY+&uyM
z)HW-LQUfYYW$q$nSg9;!DvA>q?fR!K%59Zv9J4yCQhhDGwhptpA5O5U?Hjqt>8nOD
zi{)0CI|&Gu%zunGI*XFZh(ix)q${jT8wnnzbBMPYVJc4HX*9d^mz|21$=R$J$(y7V
zo0dxdbX3N#=F$zjstTf*t8vL)2*{XH!+<2IJ1VVFa67|{?LP<VPiuN~9#0c!YR12a
zo;Lj{EKN(4nyG=Ui#tn@dJ(*;md5Ze)kd6mTF$dEZFv=nYr2Lr(==N%ad&FBajgz2
z6_^{6U)eu_=!Ix#bP)AA_tuIc?3=_Mq548F*;t3>&P41h$2i2;?N~RA30LV`BsUcj
zfO9#Pg1$t}7zpv#&)8`mis3~o+P(DxOMgz-V*(?wWaxi?R=NhtW}<#^Z?(BhSwyar
zG|A#Q7wh4OfK<|DAcl9THc-W4*>J4nTevsD%dkj`U~wSUCh15?_N@uMdF^Kw+{agk
zJ`im^wDqj`Ev)W3k3stasP`88-M0ZBs7;B6{-tSm3>I@_e-QfT?7|n0D~0RRqDb^G
zyHb=is;IwuQ&ITzL4KsP@Z`b$d%B0W<OzS}HhQ;U8}SDa=0^@=1zh?Ebwi(h3u<mG
zLDfZ57#t!A)c-~Y!O{*PdxzDz>uhioo1CWttW8yhsER1ZUZzA{F*K=wmi-sb#Ju+j
z-l@In^IKnb{bQG}Ps>+Vu_W#grNKNGto+yjA)<V{IjYd_d3*YH={C)J_}OyeI6i_H
zu|j9WcfZFU?Sgyac7umALud#l=-0F(fRl)O28qU<%HpKBh#im&8;uWW953cFj~Iy&
zlr`ZkkzG;HtUSI4CRZRj#8C;N*{hU?ezHzcM|gV*@iklj`$SU@402&viLPBGiWFL2
zQ6uyKx<>?>0?~X`4I3T@5G1)RqGUZuP^NJCq&^HykuYtMDD8qq+l8RcZNJsvN(10{
zQ1$XcGt}QH-U^WU!-wRR1d--{B$%vY{JLWIV%P<Wi12|;({s?oRC80?)@wj6UxV~n
zk2qyqDc_<v8oEujhH&m^Jq#Lrp)Z$Oj#rxlpUicHLpt@6dZF=U?wW~T_o?IN;ie!I
zV-bY1+kei0nc9KpW>4-KQuxxDeJaF#{eu&&r!3Qu{w}0f--8^H|KwE>)ORrcR+2Qf
zb})DRcH>k0zWK8@{RX}NYvTF;E~phK{+F;MkIP$)T$93Ba2R2TvKc>`D??#mv9wg$
zd~|-`Qx5LwwsZ2hb*Rt4S9dsF%Cny5<1fscy~)d;0m2r$f=83<->c~!GNyb!U)PA;
zq^!`@@)UaG)Ew(9V?5ZBq#c%dCWZrplmuM`o~TyHjAIMh0*#1{B>K4po-dx$Tk-Cq
z=WZDkP5x2W&Os`N8KiYHRH#UY*n|nvd<ovggige3u`1qGi1+Y8X!3s{W#*m=tX&CV
zNWQ(*z*>(U>yO=MFI-2BEp?x@=N<~CbLJBf6P)}vLS?xJXYJ2^<3KJUdrwKnJnTp{
zjIi|R=L7rn9b*D#Xxr4*R<3T5AuOS+#U8hNlfo&^9JO{VbH!v9^JbK=TCGR-5EWR@
zN8T-_I|&@<P6ysJp1u%bVccl?q?sU4Onn?IFII0`6;jp*_+1Vcjf$mX{%JA^!$Gkf
z>A}(hKeL4_*eb!1G8p~&_Im8|wc>Cdir+gg90n1dw?QaXcx6Op_W1r=axR<Rt0$d-
z&gdORS`9;Z%6j=d$PU%VL0xT-jF-dHo&#w}>w>4;rM*UOpT#Eb9xU1IiWo@h?|5uP
zka>-XW0Ikp@dIe;MN8B01a7+5V@h3WN{J=HJ*pe0uwQ3S&MyWFni47X32Q7SyCTNQ
z+sR!_9IZa5!&GTf&V$`q!%H8ci!a|RMx5}5MA_kr+bhtQy{-^)(hCVa@I!^TV4RBi
zAFa!Nsi3y37I5EK;0cqu|9MR<Vh>j<^r&h1lF}u0KpKQD^5Y+LvFEwM<n%Y4Ns0&r
z#Pgp7tfaM#i}k;d-@gi@qNBc}@xL(OgxbkB%Zc*U!8(yY_d_z4QrJ%DIL^_}pG(C;
zxV&Dt0*#6mW+VnKpUKH&)*t(_EhJ1#-d4~Kom-)N+kGAW3vl$z=E{EB!4#iw1#JGZ
zpZv7B?(+0N;`4s@&;+D$6BOaTPLlV-MY35`gn~5zS!mCgh|W$2sr@*jRa}74{|6)>
zLU@@v4_Na#Axy6tn3P%sD^5P#<7F;sd$f4a7L<t5V42bo`*JV+&3HWm9OI@30?%Oh
z5o+B(*v(C-H_!6}Lzhp-kE~j|H(u&BA@KX~k?60QV5NR)N2OJYIOG(f(FG`kmvdU7
zwM#zp&<w6$6785wBe4}t?5yT4MP5N47S8;*P_q6hn|Wj2S~%IPE(O9P2?RAKY>BMk
zGU^RZHBcxSA%kCx*eH&wgA?Qwazm8>9SCSz_!;MqY-QX<1@p$*T8lc?@`ikEqJ>#w
zcG``^CoFMAhdEXT9qt47g0IZkaU)4R7wkGs^Ax}usqJ5HfDYAV$!=6?>J6+Ha1I<5
z|6=9<InPN?WUE(MBZF{EDJ@lH!7KCH_7xC@JvfZL@&nc!7K2v>soU4>E))tW$<#>F
ziZ$6>K<f#VmS*<VCLk5Snrr-`d{Bp+A{=r<v#~0tw_zC-WYWg-s*<dPsHVYZm|7R#
z>Jf0bPfbx_)7-}tMINlc=}|H+$uX)mhC6-Hz+XZxsKd^b?RFB6et}O#+>Wmw9Ec9)
z{q}XFWp{3@qmyK*Jvzpyqv57LIR;hPXKsrh{G?&dRjF%Zt5<eso5q2Qq7|ChevXoo
zUUuocw%BMFdbc16MLS>&m20Ll?Oy<ul%w2Zua&zkQjQpssgWs#RKAL}6i`eHUzx7p
zSoNx{P@%ayUjixVqBLi(th$z4mR4dC*OaQENb9y_y<R>fUYC3WRn{cgQ?^V~UAv+5
z&_m#&nIwffgX1*Z2#5^Kl4DbE#NrD&Hi4|7SPqZ}(>_+JMz=s|k77aEL}<=0Zfb)a
z%F(*L3zCA<=xO)2U3B|pcTqDbBoFp>QyAEU(jMu8(jLA61-H!ucI804+B!$E^cQQa
z)_ERrW3g!B9iLb3nn3dlkvD7KsY?sRvls3QC0qPi>o<)GHx%4Xb$5a3GBTJ(k@`e@
z$RUa^%S15^1oLEmA=sayrP5;9qtf!Z1*?e$ORVPsXpL{j<cf(aoOxSwSjBR1mea0e
z^c3Q=wn8)%*koW31D%}j9dO0gR7Y@b_00J@vMv~iauOuPVkQGKG^LpkGueXj*z<(H
zv6PsTl$Bd^g^4yr-LK|PFHGhgs2bdrT$8)TR7nc(mnkPw6vrbaA_vA0JdMNVsoX7X
zzI)+QrS1A&rLp4hm_yCc#tP)G{!hBfUV@*{)uh;EQVyvIbs@16JE!9Psq3UaXMGQ^
zJ^Y2zHl3Zl1idw?=a56!^Y{sB%B-k(>L<6E)0sj&swP3}NPmR%FM?O>SQgN5XfHE<
zo(4#Cv11(%Nnw_{_Ro}r6=gKd{k?NebJ~<~Kv0r(r0qe4n3LFx$5%x(BKvrz$m?LG
zjLIc;hbj0FMdb9aH9Lpsof#yG$(0sG2%RL;d(n>;#jb!R_+dad+K;Ccw!|RY?uS(a
zj~?=&M!4C(5LnlH6k%aYvz@7?xRa^2gml%vn&eKl$R_lJ+e|xsNfXzr#xuh(>`}9g
zLHSyiFwK^-p!;p$yt7$F|3*IfO3Mlu9e>Dpx8O`37?fA`cj`C0B-m9uRhJjs^mRp#
zWB;Aj6|G^1V6`jg7#7V9UFvnB4((nIwG?k%c7h`?0tS8J3Bn0t#pb#SA}N-|45$-j
z$R>%7cc2ebAClXc(&0UtHX<>pd)akR3Kx_cK+n<}FhzmTx!8e9^u2e4%x{>T6pQ`6
zO182bh$-W5A3^wos0SV_TgPmF4WUP-+D25KjbC{y_6W_9I2_vNKwU(^qSdn&>^=*t
z&uvp*@c8#2*paD!ZMCi3;K<prH4a&u_&GPH7Wp*~+CzWZpzTbL&)4k=HC|E1=uT#O
zPuYcj5Jbb}c9+j=4foN!N-fSV`(c<30`iukl213!u4qI^cD3Ytg!~P3N1S(`-3^yF
zlFzoPUGJT0f@f{`ZDabbR@mNt3*M;G<P@?W{8}}Lg`Hvy7&Jmu=04fd1erYTPEwb=
z15%g^dl!<DS<}y*RUs*g6?{>{Na;I4Q35zw$YrW5U@Kk~)&rw;G?d7Q&c9|x<<Maw
zgBLn8*CoGPVj_^rpPn~ENvB}-`?vqbUaC%e+l73U+D^-Cb&Pj13W#6g!+x^$_tX)*
z@cs9Wk+{Dzx8NJw-G7(M|EOb>Hg|CNMsxovmfth*|E*GHezPTWa^Hd^F4!B3sF;)?
z(NaPyAhocu1jUe(!5Cy|dh|W2=!@fNmuNOzxi^tE_jAtzNJ0JR-avc_H|ve#KO}#S
z#a(8secu|^Tx553d4r@3#6^MHbH)vmiBpn0X^29xEv!Vuh1n(Sr5I0V&`jA2;WS|Y
zbf0e}X|)wA-Pf5gBZ>r4YX3Mav1kKY(ulAJ0Q*jB)YhviHK)w!TJsi3^dMa$L@^{`
z_De`fF4;M87vM3Ph9SzCoCi$#Fsd38u!^0#*sPful^p5oI(xGU?yeYjn;Hq1!wzFk
zG&2w}W3`AX4bxoVm03y>ts{KaDf!}b&7$(P4KAMP=vK5?1In^-YYNtx1f#}+2QK@h
zeSeAI@E6<gTYtZud5<DeMJ>Z8a?)>sZ`fbq9_snl6LCu6g>o)rO;ijp3|$vig+4t}
zylEo7$SEW<_U+qgVcaVhk+4k+C9THI5V10qV*dOV<w;)q>6pPtAI$)QN{!JRBKh-D
zk2^{j@bZ}yqW?<#VVuI_27*cI-V~sJiqQv&m07+10XF+#ZnIJdr8t`9s_EE;T2V;B
z4UnQUH9EdX%zwh-5&wflY#ve!IWt0UE-My3?L#^Bh%kcgP1q{<CvcqqQ2utk7s%sV
zoGl}#Zl)W@RNSAAf;w-DBO+*e0HO2%x-G=Z;*Pl$zHy^xW)%na$gbyTIw>&26eXLn
zTkjJ*w+(|_>Pq0v8{%nX$QZbf)tbJaLY$03;MO=Ic-uqYUmUCuXD>J>o6BCRF=xa%
z3R4SK9#t1!K4I_d>tZgE>&+kZ?Q}1qo4&h%U$GfY058s%*=!kac{0Z+4Hwm!)pFLR
zJ+5*OpgWUrm0FPI2ib4NPJ+Sk07j(`diti^i#kh&f}i>P4~|d?RFb#!JN)~<!~Z`*
zivNy#7kzu<{{tyjD6d)1{g;-B-EK2+0;|?2Nj`=2hUDsRiVj-}RAJN{d@x~38|)#_
zx&F#UxFFdbXxE(|#84p;-%dtBDbgEpl>D@)beox}bw?4VCf^y*`2{4`-@%SFTry2h
z>9VBc9#JxEs1+0i2^LR@B1J`B9Ac=#FW=(?2;5;#U$0E0UNag_!jY$&2diQk_n)bT
zl5Me_SUvqUjwCqmVcyb`igygB_4YUB*m$h5oeKv3uIF0s<pxU7XrV;DR{UhyjHRs5
zb+8Qf7A65FfQ?d1ZT2w}F_l*Eb)?ah<8c%Yy;Eal4{xBsX^nN@Pe5CxcymxUwL?eh
zv9_Z0XXBqZl6EhcKDo~Ou&%?PpG{{$wPe(7oy?yZ1mnWmr0b~pN$igR!(Rx*QN$iy
z=-Re}qI2g(ku?t~HgBj3V=|H$hiN2{j!P%zCB+1x34pnjx#?&{ENcU`o_2tynp}0U
zKI9mTgI{WS`?XY!3FH!0Q>k}~es!{D>4r%PC*F~FN3owq5e0|Y<Du-bB4EU)q{6=q
z#<0gBE8S|!ZrmQeH3JgM^AxLU0k8cAwCY-9?0w8gxwWKqzGP>eUTSG#Vq%&Gk7uwW
z0lDo#_wvflqHeRm*}l?}o;EILszBt|EW*zNPmq#?4A<L0#2f-Fpgzo6i9m?Cv{^Fe
z9>+&i0xx^?9obLyY4xx=Y9&^G;xYXYPxG)DOpPg!i_Ccl#3L}6xAAZzNhPK1XaC_~
z!A|mlo?Be*8Nn=a+FhgpOj@G7yYs(Qk(8&|h@_>w8Y^r<TLc~8#)=w@0;xlrL@mM3
zg*K(X)@-O)lt;P?5e(;WTL%O;a;rQNAE5;DqERSyAXc1biP%NUWXy?=-B^)wQ=+I4
zU%qA-ghSXXn27E3w8NMG!5XHJY>&5nCqe0V60rRz?b5%J;GYeBqSAjo|K692GxD4`
zRZyM2FdI+-jK2}WAZTZ()w_)V{n5tEb@>+JYluDozCb$fA4H)$bzg(Ux{*hXurjO^
zwAxc+UXu=&JV*E59}h3kzQPG4M)X8E*<G*nR0cBsK+3(q5`<{N)Z$_eT#;miD(s%h
z{fdYdgo~K&tWs<DY?yIi#?k!bT;M<ZDoV|<xhf7jcRFXDXl`LtGFz=LPAW$(hAEz}
zq@oGhJoeM0w4KvLTg%>}#_&}w*KEg<F5P|-B$Y<3$zfM|>tX)cU{vm9b$atHa;s>|
z+L6&cn8xUL*OSjx4YGjf6{Eq+Q3{!ZyhrL&^6Vz@jGbI%cAM9GkmFlamTbcQGvOlL
zmJ?(FI)c86=JEs|*;?h~o)88>12nXlpMR4@yh%qdwFNpct;vMlc=;{FSo*apJ;p}!
zAX~t;3tb~VuP|ZW;<Q&V!o{~5>z$=IHf->F@Ml)&-&Bnb{iQyE#;GZ@C$PzE<QuI)
zv_|vm%I_n1Dpq6lr--l%%tq7K!<v~?55k`WhA?y(q<f`<c6%@dUw9u~aA?j^`pueW
zW?_3n{u)d4@AQyf;UHiIRxp16RoWg&F+uwIJYB{!Spu!Z6TFEXau<!8UfawC4vbZv
zJTpZLC-RhzHO9xSd6HqYzkfjT+8e>f6~q}4D>9jic@mTO5x76ulDz@+XAcm35!VSu
zT*Gs>;f0b2TNpjU_BjHZ&S6Sqk6V1370+!eppV2H+FY!q*n=GHQ!9Rn6MjY!Jc77A
zG7Y!lFp8?TIHN!LXO?gCnsYM-gQxsm=Ek**V<u>mZu7vnuufD7K~GIxfxbsQ@qv2T
zPa`tvHB$fFCyZl>3oYg?_wW)C>^_iDOc^B7klnTOoytQH18WkOk)L2BSD0r%xgRSW
zQS9elF^?O=_@|58zKLK;(f77l-Zzu}4{fXed2saq!5k#UZAoDBqYQS{sn@j@Vtp|$
zG%gnZ$U|9@u#w1@11Sjl8ze^Co=)7yS(}=;68a3~g;NDe_X^}yJj;~s8xq9ahQ5_r
zxAlTMnep*)w1e(TG%tWsjo3RR;yVGPEO4V{Zp?=a_0R#=V^ioQu4YL=BO4r0$$XTX
zZfnw#_$V}sDAIDrezGQ+h?q24St0QNug_?{s-pI(^jg`#JRxM1YBV;a@@JQvH8*>>
zIJvku74E0NlXkYe_624>znU0J@L<-c=G#F3k4A_)*;ky!C(^uZfj%WB3-*{*B$?9+
zDm$WFp=0(xnt6`vDQV3Jl5f&R(Mp};;q8d3I%Kn>Kx=^;uSVCw0L=gw53%Bp==8Sw
zxtx=cs!^-_+i{2OK`Q;913+AXc_&Z5$@z3<)So0CU3;JAv=H?@Zpi~riQ{z-zLtVL
z!oF<}@IgJp)Iyz1zVJ42!SPHSkjYNS4%ulVVIXdRuiZ@5Mx8LJS}J#qD^Zi_xQ<pa
zK0_C<`%bp5M~CVCk7hV^j*M;Wzcj7kCsCfgg5CJ~2`y3|66=yp|GC7FJNP7A_Wc+(
zejiW#M^nRp{rUgmIRC{MB`ST%d>@>DKDr-_e#>5h3dtje*NcwH_h;i{Sx7}dkdpuW
z(yUCjckQsagv*QGMSi9u1`Z|V^}Wjf7B@q%j2DQXyd0nOyqg%m{CK_lAoKlJ7#8M}
z%IvR?Vh$6aDWK2W!=i?*<77q&B8O&3?zP(Cs@kapc)&p7En?J;t-TX9abGT#H?TW?
ztO5(lPKRuC7fs}zwcUKbRh=7E8wzTsa#Z{a`WR}?UZ%!HohN}d&xJ=JQhpO1PI#>X
zHkb>pW04pU%Bj_mf~U}1F1=wxdBZu1790>3Dm44bQ#F=T4V3&HlOLsGH)+AK$cHk6
zia$=$kog?)07HCL*PI6}DRhpM^*%I*kHM<#1Se+AQ!!xyhcy6j7`iDX7Z-2i73_n#
zas*?7LkxS<P{ZTB#tR|&N^U;Moy2#JwwW4RFPddYtD_bw0R1|Eo=5;j>-XSqv;YBa
zW_n*32D(HTYQ0$feV_Fru1ZxW0g&iwqixPX3=9t4o)o|kOo79V$?$uh?#8<F`E$a_
zutly1{7L1J@Y@6Vp*~KB!yXMF2QHqby@+ZG8+ND)X+s9is!(NOe)h&%h+bxjPFhwq
z$60~SJQ<aykcGl3;BUCZ>Q8e>4e)V6;_(x&ViUVxma+i25qea;d-oK7ouuDsB^ab{
zu1qjQ%`n56VtxBE#0qAzb7lph`Eb-}TYpXB!H-}3Ykqyp`otprp<BVE0iW(NxIg}T
zHQz%!Kt^1I=QqGS(r32Y=&DuF_0#yaLgW`I>7{VEuW*^IR2n$Fb99*nAtqT&oOFIf
z@w*6>YvOGw@Ja?Pp1=whZqydzx@9X4n^2!n83C5{C?G@|E?&$?p*g68)kNvUTJ)I6
z1Q|(#UuP6p<iHaJ>j78GUxq11m-GSszc+)X{C2eo-?8ud9sB=3(D47v?`JAa{V(IF
zPZQ_0AY*9M97>Jf<<kmA6!?J&2x7=_q{>o%#O_%Wq}8>YM=q0|tGY+hlXcpE=Z4Od
z`NT7Hu2hnvRoqOw@g1f=bv`+nba{GwA$Ak0INlqI1k<9!x_!sL()h?hEWoWrdU3w`
zZ%%)VR+Bc@_v!C#koM1p-3v_^L6)_Ktj4HE>aUh%2XZE@JFMOn)J~c`_7VWNb9c-N
z2b|SZMR4Z@E7j&q&9(6H3yjEu6HV7{2!1t0lgizD;mZ9$r(r7W5G$ky@w(T_dFnOD
z*p#+z$@pKE+>o@%eT(2-p_C}wbQ5s(%Sn_{$HDN@MB+Ev?t@3dPy`%TZ!z}AThZSu
zN<1i$s<Qod+!u+1TpqzHMAR;(P|C33h|NdU1+@toT{?QhAJAzzUDj;ch>iJhXFdjV
zP*y|V<`V8t=h#XTRUR~5`c`Z9^-`*BZf?WAehGdg)E2Je)hqFa!k{V(u+(hTf^Yq&
zoruUh2(^3pe)2{bvt4&4Y9CY3js<F>)PUHtd4rVG57}uFJL)D(JfSIo^{P=7liFXG
zq5yqgof0V8paQcP!gy+;^pp-DA5pj=gbMN0eW=-eY+N8~y+G>t+x}oa!5r>tW$xhI
zPQSv=pi;~653Gvf6~*JcQ%t1xOrH2l3Zy@8AoJ+wz@daW@m7?%LXkr!bw9GY@ns3e
zSfuWF_gkWnesv?s3I`@}NgE2xwgs&rj?k<VL?gG5MC{Nmj1vZX?3e8O$&f`#KcfCT
zD|dGfAH<9vQYUE_U}e#K2epdwK03De5{_327SI@sw~J+|<wi@;rZX!9Y2MH7_L7?E
z^an@e4GxaY9F(p#Ot=#L(YG%x=Gq!vNbxtM=IXzPyPmYSGU#`>H-FEy82=O8`+szN
ziHch`vvS`zNfap14!&#i9H@wF7}yIPm=UB%(o(}F{wsZ(wA0nJ2aD^@B41>>o-_U6
zUqD~vdo48S8~FTb^+%#zcbQiiYoDKYcj&$#^;Smmb+Ljp(L=1Kt_J!;0s%1|JK}Wi
z;={~oL!foo5n8=}rs6MmUW~R&;SIJO3TL4Ky?kh+b2rT9B1Jl4<n8E`j>>#Uh-Bec
z`Hsp<==#UEW6pGPhNk8H!!DUQR~#F9jEMI6T*OWfN^Ze&X(4nV$wa8QUJ>oTkruH#
zm~O<`J7Wxseo@FqaZMl#Y(mrFW9AHM9Kb|XBMqaZ2a)DvJgYipkDD_VUF_PKd~dT7
z#02}bBfPn9a!X!O#83=lbJSK#E}K&yx-HI#T6ua)6o0{|={*HFusCkHzs|Fn&|C3H
zBck1cmfcWVUN&i>X$YU^Sn6k2H;r3zuXbJFz)r5~3$d$tUj(l1?o={MM){kjgqXRO
zc5R*#{;V7AQh|G|)jLM@wGAK&rm2~@{Pewv#06pHbKn#wL0P6F1!^qw9g&cW3Z=9}
zj)POhOlwsh@eF=>z?#sIs*C-Nl(yU!#DaiaxhEs#iJqQ8w%(?+6lU02MYSeDkr!B-
zPjMv+on6OLXgGnAtl(ao>|X2Y8*Hb}GRW5}-IzXnoo-d0!m4Vy$GS!XOLy>3_+UGs
z2D|YcQx@M#M|}TDOetGi{9lGo9m-=0-^+nKE^*?$^uHkxZh}I{#UTQd;X!L+W@jm(
zDg@N4+lUqI92o_rNk{3P>1gxAL=&O;x)ZT=q1mk0kLlE$WeWuY<p^lk9k<q+rcOGG
zY)G$sy1c;kpqg0vV-}_XHLMzubt5&Y+X3Q{3Wa&iSOY9S8qUS1LUsYa--u3<U|kYH
zfL}q@Sl3A;lg32U^*mSX!dr5wpp#<9G)=5WC=&Cv)mW|a!muj?rXU0JHBrQ<`Qqt}
zCgYqLnoe5^we#~H-+!p+9n;rMDHiXMi5YFyOWW{wi{Tnu%1mqAov`>_$0`0jY-Kkt
zP*|m3AF}Ubd=`<>(Xg0har*_@x2YH}bn0Wk*OZz3*e5;Zc;2<o%?~}~ck-Gk+}B1o
z7H(amz-SpgFI})ialV|e<4!f0)HG}_n?GAIDeiC%vdRTJZ<WeGYT+p)vyz_FBWtO$
zz2K9gb9XN8(>uBdnl8?&XjupbkOeNZsNh6pvsq_ydmJI+*z**{<vBKXP!vVq<!p_e
z&dE_6Lim}RGRF|DDL<W_^>I{0K)-;p1~k8cpJXL$^t!-`E}=*4G^-E8>H!LjTPxSx
zcF<xkt%17w#Nu8CTO5_pkM9Mxb}Wf0;14cP1{yv5#7uIFNY2eGhq{_*hEBSbjQA$U
znAZkjT-yd=I_R8ZJ?H07yh5z>+cS`ommfKMhNSbas^<U&=a>@YbTpH1*RFrBuATUR
zt{oFWSk^$xU&kbFQ;MCX22RAN5F6eq9UfR$ut`Jw--p2YX)A*J69m^!oYfj2y7<PW
z+v>NYcH6&r+0~_sH^c^nzeN1AU4Ga7=FlR{S|Mm~MpzY0$Z+p2W(a={b-pR9EO1Rs
zB%KY|@wLcAA@)KXi!d2_Bxr<pdgvLNQgZmCJz&c*%>khDn`DT1=Dec}V!okd{$+wK
z4E{n8R*xKyci1(CnNdhf$Dp2(Jpof0-0%-38X=Dd9PQgT+w%Lshx9+loPS~MOm%ZT
zt%2B2iL_KU_ita<m0BJ>%N>xjB!<T714UjSOi9+HnppU8HTO6Xys3~>#71_3=3c}o
zgeW~^U_ZTJQ2!PqXulQd=3b=XOQhwATK$y(9$#1jOQ4}4?~l#&nek)H(04f(Sr=s|
zWv7Lu1=%WGk4FSw^;;!8&YPM)pQ<cfOEqZOX3qg|bi6Y+6raTouS~FCMLV)D&#=5p
zIeXB!ZqEvR`rjuFN1ix6GoI%|3=23*fhels&m^Kl7$Xb)d4}z-AG?ZOEDO)5!dX$;
zxo;%86BwnKIVK{n#wbp)z+DlG`Eo;!p1qmI5u}Dr3ERkBC^gA;rI=Ohq{XCvK{N9A
zv&z##C1k^|5<I!-;+MCJN#mX7#cD{4PE)89nNv$gm~ronTcb2Mq~#~4^M!^C-1#M(
z=1UT>DCY9DhU`hMty1@sq1=Tj7bFsOOBZOFlpR`W>-J$-(kezWJj;`?x-v>ev{*8V
z8p|KXJPV$HyQr1A(9LVrM47<GkZ=yfPF+Dq%S|w=MijcJ6`g68YLr!qXVkqpG~JGH
zv`>u-XpcrIyO`yWvx1pVYc&?154aneRpLqg<bQ>x)EMvRaa#|9?Wwqs2+W8n5~79G
z(}iCiLk;?enn}ew`HzhG+tu+Ru@T+K5juvZN)wY;x6HjvqD!&!)$$;1VAh~7fg0K|
zEha#aN=Yv|3^~YFH}cc38ovVb%L|g@9W6fo(JtT6$fa?zf@Ct88e}m?i)b*Jgc{fl
zExfdvw-BYDmH6>(4QMt#p0;FUIQqkhD}aH?a7)_%JtA~soqj{ppP_82yi9kaxuK>~
ze_)Zt>1?q=ZH*kF{1iq9sr*tVuy=u>Zev}!gEZx@O6-fjyu9X00gpIl-fS_pzjpqJ
z1yqBmf9NF!jaF<+YxgH6oXBdK)sH(>VZ)1siyA$P<#KDt;8NT*l_0{xit~5j1P)FN
zI8hhYK<Ctos5a2iSB6E;K{q?&ab{FphO?zxIqqf}%h}LQupBY+8nGBng;9rl>hQ)i
z37^aP<qpGiOwA$)u%NPBnx5-dJ?eaKuJ|k=(U7<z&!E=Ex{~rH$w*MsBugwy8}mlc
z@Cp`bIFkJ)nD=}RT7wXAD(8ljk?9q}6wNph<*7S`FnAlTK859*a=phG5gBZhql8^1
zqKXJBJSm<4{Im$>13B~u65?sg+_@2Kr^iWHN=U;EDSZ@2W2!5ALhGNWXnFBY%7W?1
z=HI9JzQ-pLKZDYTv<0-lt|6c-RwhxZ)mU2Os{bsX_i^@*fKUj8*aDO5pks=qn3Dv6
zwggpKLuyRCTVPwmw1r}B#AS}?X7b837UlXwp~E2|PJw2SGVueL7){Y&z!jL!XN=0i
zU^Eig`S2`{+<wl==2w=5|F9xM-02N5`F*r(R=yBH;xL${JnA$s&UywB#{_0RS^+hX
z*x9l+ftTA)(qqfU_K+4UB=w=A|0J9m!!ePjqBV0F7$&R=n`+yR@2tk2NwHhL{|&cH
z$fXb3^<M+ME~B<-d*&_qT19T_sRLwwvu;hmu)Vt+WHH@$?DQ6m2&aLvtcbK<MgTBu
zp(SQPX~F@0CgG?+)(jWG3Oc!+oEMIunjIDK0w|m6;WzWCMpr#dq3I<GeN7c@71Fqq
zf&ADs4Jz}_R;T_`?S9~(wB(9e>gU$68aRdWx?BZ{sU_f=8sn~>s~M?GU~`fH5kCc;
z8ICp+INM3(3{#k32RZdv6b9MQYdZXNuk<tNnM*Zj3!<Rmy`SQx3idGTVVW@OzSywq
z<sw@>7ed8;G?S2nT+NZBG=Tar^KFl2SvhW$bGW#kdWL-I)s_IqVnCDDM9fm8g;P;8
z7t4yZn3^*NQfx7SwmkzP$=fwdC}bafQSEF@pd&P8@H#`swGy_rz;Z?Ty5mkS%>m#%
zp_!m9e<()sfKiY(nF<1zBz&&`ZlJf6QLvLhl`_``%RW&{+O>Xhp;lwSsyRqGf=RWd
zpftiR`={2(siiPAS|p}@q=NhVc0ELprt%=fMXO3B)4ryC2LT(o=sLM7hJC!}T1@)E
zA3^J$3&1*M6Xq>03FX`R&w*NkrZE?FwU+Muut;>qNhj@bX17ZJxnOlPSZ=Zeiz~T_
zOu#yc3t6ONHB;?|r4w+pI)~KGN;HOGC)txxiUN8#m<I|Y6ES5NY<qwYy-|}EoiBmM
zzK&og-IJMpwjbL8IAA?{APd++5KnIBFcmKwZzO~h`v>exj+W(cz%9a4sx|IRG=}ia
zuEBuba3AHsV2feqw-3MvuL`I+2|`Ud4~7ZkN=JZ;L20|Oxna5vx1qbIh#k2O4$RQF
zo`tL()zxaqibg^GbB+BS5#U{@K;WWQj~GcB1zb}zJkPwH|5hZ9iH2308!>_;%msji
zJHSL~s)YHBR=Koa1mLEOHos*`gp=<n)R&-+66xg`pqUXP#0Zm{sf^MKJnR>s8KA-C
zu0aE+W!#iJ*0xqKm3A`fUGy#O+X+5W36myS>Uh2!R*s$aCU^`K&KKLCCDkejX2p=5
z%o7-fl03x`gaSNyr?3_JLv?2RLS3F*8ub>Jd@^Cc17)v8vYEK4aqo?OS@W9mt%ITJ
z9=S2%R8M){CugT@k~~0x`}Vl!svYqX=E)c_oU6o}#Hb^%G1l3BudxA{F*tbjG<UG_
z<Vo0tRnGPd)K5|7jd0}T-wQdZZG$TREj=4*<4bR;^};Y7orbT=`ITOz*@g<Y=x;1T
zesE`pc}OxPz?01Be<R|c+WT7B<35I5;~ham;Y6hY?F{PCSdwf@9qXBZn%JBWfW6@H
zxqGR{o+TW^4T&@lZ$GVT-8s0{R3MmXsMGGDxgNTZ8|S`+<Qxcf#Ei_^nsS}Yt*PB*
z5#h+HDAU+!GmbOJ#d(J8|6Rt?+U5gR1>;W_>=xV73pKY53v%>I)@D36I_@&p$h|Aw
zonQS`07z_F#@T-%@-Tb|)7;;anoD_WH>9ewFy(ZcEOM$#Y)8>qi7rCnsH9GO-_7zF
zu*C87{Df1P4TEOsnzZ@H%&lvV(3V@;Q!%+OYRp`g05PjY^gL$^$-t<lOaPfbWQ29U
ziQLZAEqJX}(BXW*YUz0#v0~iKqbJ35-`aw1m+YA~k)TQVyq!wOKDE%}gHJ%Woa=@J
z_G3Z9VfhbWs>0Y>H*CDDs?FZly*oZ&dxvsxaUWF!{em4{A>n@vpXg$dwvt@_rgmHF
z-MER`ABa8R-t_H*kv>}CzOpz;!>p^^9ztHMsHL|SRnS<-y5Z*r(_}c4=fXF`l<Xkw
zEy6TsVDdDoV_TNG(<WvkK8TcvFZ^8LA2wsz%Sl;DbLS}my*l(?>^-i}>e7v!qs_jv
zqvWhX^F=2sDNWA9c@P0?lUlr6ecrTKM%pNQ^?*Lq?p-0~?_j50xV%^(+H>sMul#Tw
zeciF*1=?a7cI(}352%>LO96pD+?9!fNyl^9v3^v&Y4L)mNGK0FN43&Xf8jUlxW1Bw
zyiu2;qW-aGNhs=zbuoxnxiwZ3{PFZM#Kw)9H@(hgX23h(`Wm~m4&TvoZoYp{plb^>
z_#?vXcxd>r7K+1HKJvhed>gtK`TAbJUazUWQY6T~t2af%#<+Veyr%7-#<!`u7=6z<
z@9(d@bkwuJK`;AXMIasQ=4>*A#@&*;@g58{i|E%6yC_InGXCOd{L0;$)z#?n7M`re
zh!kO{6=>7I?*}czyF7_frt#)s1CFJ_XE&VrDA?Dp3XbvF{qsEJgb&OLSNz_5g?HpK
z9)8rsr4JN!Af3G9!#Qn(6zaUDqLN(g2g8*M)Djap?WMK9NKlkC)E2|-g|#-rp%!Gz
zAHd%`iq|81efi93m3yTBw3g0j#;Yb2X{mhRAI?&KDmbGqou(2xiRNb^sV}%%Wu0?<
z?($L>(#BO*)^)<q1<y(%o-D>rSgyNRni$i`R4v;GhlCZ8$@e^ROX(p=2_v6Y!%^As
zu022)fHdv_-~Yu_H6WVPLpHQx!W%^6j)cBhS`O3QBW#x(eX54d&I22op(N59b*&$v
zFiSRY6r<ogkg`lB4Kzk}79-1@4WexUMjw+78PVxKkpJ}l$#uYSKRni~wAs(LFQ`S~
z)6H^=SsBl_=gtAZcCb%LqI~={V0L=Y2XD)_)<%!{eY=Ch6CuBtAu<8uk=VNIh~<**
z4}OE-7;4DiEfmH5r(r_l!C{NrR4GiA;)KB7^Z5GJe5Gi4jN{kozWVvza9J%ysu#}1
zV05Y-@;(u_e>Oc^(dgSV1<S;M;fP~XvG?H2UWU4_zajZjOwrCC*tclCC;-DiooNK0
zKT=dwZdL_ATeNsapPF;r>>a7-5C;(5S5MvKcM2Jm-LD9TGqDpP097%52V+0>Xqq!!
zq4e3vj53SE6i8J`XcQB|MZPP8j;PAOnpGnllH6#Ku~vS42xP*Nz@~y%db7Xi8s09P
z1)e%8ys6&M8D=Dt6&t`iKG_4X=!kgRQoh%Z`dc&mlOUqXk-k`jKv9@(a^2-Upw>?<
zt5*^DV~6Zedbec4NVl(<J^HBK@2E4@wD3MtdV(xxnq%Vbc}WuHo}5QftrZiThWddC
z`SqHbMkXtVXKo79381*cF)4R%emsAj0XSNL+PDEL#FejmgEu5hh1&sJBWank<?5||
zFa70^J_fIcXV;YE%H5TE-LegY#;Q{2+X5ec9PUkBc$GBoPD$f3kMxcc{GCuyqMnT@
zoFpa`18N8o#cD|?wHX2`2uRGD5<2)(v9&spIF?JOuSy<x-3h*1uo<tmXh9c!`+f(x
zJ!3;pKi`8)fAw>$2T{&b)zA@b#dUyd>`2JC0=xa_fIm8<d`*pjaOx{pV5Pe7q{O1W
zAT5c_%T(D{?pE<afMwAc3^p*w8J|rwP_Jm84rW1XYj_z!4LWkm8d^QnYM3TAJ00M}
zVy+@IpL$^~2r+Bvv<<LIU<+tp*%PbBjNTe&Z{H48g3%crRya-=a)qRylf)#ctNvw?
zlFff;8hFwWk7>{5u<t#%K`^*tgQ@!!adiD7YiKBgV_c5|kR2YSiy*0+0NhSocT-E<
zLsbh?CBfxQ!F7|i4p=%MX(y=Km3GT?bty_*CZh1*xF8v|8xjqfoni!cQE1EFLyy>m
zr-!ApXZhC8@=vC2WyxO|!@0Km)h8ep*`^he92$@YwP>VcdoS5OC^s38e#7RPsg4j+
zbVGG}WRSET&ZfrcR(x~k8n1rTP%CnfUNKUonD$P?FtNFF#cn!wEIab-;jU=B1dHK@
z(;(yAQJ`O$sMn>h;pf^8{JISW%d+@v6@CnXh9n5TXGC}?FI9i-D0OMaIg&mAg=0Kn
zNJ7oz5*ReJukD55fU<geid?Ih<u$lD<ZaBChRKMH%^g0f>sMuaP+H4tDN&V9zfqF@
zr=#ecUk9wu{0;!+gl;3Bw=Vn^)z$ahVhhw)io!na&9}LmWurLb0zubxK=UEnU*{5P
z+SP}&*(iBKSO4{alBHaY^)5Q=mZ+2OwIooJ7*Q5XJ+2|q`9#f?6myq!&oz?klihLq
z4C)$XP!BNS0G_Z1&TM>?Jk{S~{F3n83ioli=IO6f%wkvCl(RFFw~j0tb{Gv<R+ryT
zRX%I@y>XTx>*sB0McY0s&SNvj4+^h`9nJ_wM>F!Uc>X}9PifQekn0sKI2SAJP!a4h
z5cyGTuCj3ZBM^&{dRelIlT^9zcfaAuL5Y~bl!ppSf`wZbK$z#6U~rdclk``e+!qhe
z6Qspo*%<)eu6?C;Bp<^VuW6JI|Ncvyn+LlSl;Mp22Bl7ARQ0Xc24%29(<s4_N=u??
z$t{gru-VXd6Kxbxv5Bt?Z$yc1w+D)_3NsUN5!&<3)ieB&Nu@~@oJ<S*(@c3&Pewi0
z%9!QRq|vABdor|x%wu0~=1Z5hOOpQi`0!iyJhFLc128BQmq$$|x}WJU?iN}7Kl;!3
z&fH)Q*P121qPNW?v_ooy8Sm4CFA(z37NUr<`Xy>ZrdsIPw&-=yHQ7_Vle|5h>AST0
zUGX2Zk34vp?U~IHT|;$U86T+UUHl_NE4m|}>E~6q``7hccCaT^#y+?wD##Q%HwPd8
zV3x4L4|qqu`B<QDcIkg$mi~*?H~RNY_Wx4D`}Y)A)!YT!6xCZ~ZTPl7{FKBwUP;<e
zGwA>$4(LXqDJngNy-{&@aFBvVsywt@X^}iH7P%>bR?ciC$I^U-4Foa<B~H&?t+Qu`
zYwLM1`)@`@%8{2TvE*VigXq!t`qQLW_S5DOEz|2z2j3@V_m6j4f9Dj+Tf}F*MS{?9
z%5n(*$y|Ke#xMg=rzn#aJmhAj==f%8S}Mvc)f)j&X?h~FezLP0LfVpNB_5sLG5z-3
z-35pyFHV0nPmuu&M8{s3y}I4c7J41@C$_+Wqk&1f`MvOF;v`)pAYGN4MEXuFe)LY2
z=&C(w{X1B@m%`@ul3h(Gtch>`YKI^qDyGK7k%E%c_P=yzAi`YnxGA%DeNd++j3*h^
z=rn>oBd0|~lZ<6YvmkKY*ZJlJ;Im0tqgWu&E92eqt;+NYdxx`eS(4Hw_Jb5|yVvBg
z*tbdY^!AN;luEyN4VRhS@-_DC{({ziH{&Z}iGElSV~qvT>L<HMHzj7J-Kpa!p!c29
zr8L!oM5$VXc*@gwRrKuo*h${B7BEkfln@c=6oRf(*M;GdM=)m;H&XnLvs%-2b*+hr
z7OLt;wv$AG{1d5A_3iuPkRtq^Z3(lga~pLocX)JXz8xtPuFH$tb1E#7^Np@GfB#l+
z&L?_OtoPwP5<R)d%5@nIE}~}{W{Q)eZmHbhg7xXREu-ZQD=)K37HlG2J>-8G%+yEL
zX#MFOhj{InyKG=mvW-<1B@c-}x$vA(nU?>S>0*eN#!SLzQ)Ex7fvQ)S4D<8|I#N$3
zT5Ei`Z?cxBODHX8(Xp73v`IsAYC@9b;t}z0wxVuQSY1J^GRwDPN@qbM-ZF48T$GZ<
z8WU+;Pqo?{ghI-KZ-i*ydXu`Ep0Xw^McH_KE9J0S7G;x8Fe`DVG?j3Pv=0YzJ}yZR
z%2=oqHiUjvuk0~Ca>Kol4CFi0_xQT~;_F?=u+!kIDl-9g`#ZNZ9HCy17Ga1v^Jv9#
z{T4Kb1-AzUxq*MutfOWWZgD*HnFfyYg0&e9f(5tZ>krPF6{VikNeHoc{linPPt#Si
z&*g>(c54V8rT_AX!J&bNm-!umPvOR}vDai#`CX___J#=zeB*{4<&2WpaDncZsOkp*
zsg<%@@rbrMkR_ux9?LsQxzoBa1s%$BBn6<mos5IdgH=dhp$~J!{0^n6tTjg;U5Diz
zxn*0gDh2*1rZJV&&gt&fW9znj@{DqJLV4eBUx+J-d4%cpr)wD1@Vx?X)?B*tGi&A=
zu5vL>vk#{&&zUwcfzeCBJUwFYSF$08qDsB;gWQN*g!p8pxjofWbqNSZOEKOaTx@+*
zwdt5*Q47@EOZ~EZL9s?1o?A%9TJT=Ob_13yyugvPg*e&ZU(r6^k4=2+D-@n=Hv5vu
zSXG|hM(>h9^zn=eQ=$6`JO&70&2|%V5Lsx>)(%#;pcOfu>*nk_3HB_BNaH$`jM<^S
zcSftDU<V-inKL>1?nL;jy)+sfonQN}(}gUW?d_ikr*3=^{G)=tjBtEPe>TO|0ddVB
zTklrSHiW+!#26frPXQQ(YN8DG$PZo?(<o9TOVxrss2Tawf48g5GCBiDSDE3#UTp|k
z0pKVwU|jx{+EQY()yCur&pg1mIZ@qM8XqZ|+FwhjuUu?KF@3ju{(}}|suk~@HhJ@t
zQ#Y9~FZ`d#%R!jufJh!!RQMg1{%cNgteq&qcX<80AJGOV1RA*AhOQap$U?Y%h(E_|
z8KTI5C~yZDX7BVzv96*H*$a>po(QUCCf_OJC`pw*uey00%gmH!`WJkrKXj2!<hVw7
zGRWHF)G~HffGg-$(O!{Pk3Jwp$~FflQ(t@$&I&M44Aeq=eh)c85(&68I*-`m6uoK%
zdl?LKwDh&L2fOllfoB@M_mp%O$0z3aZY$k-iHXr}^=#M>#6?`T25mTu9OJp2L8z3!
z=arrL$ZqxuE{%yV)14Kd>k}j7pxZ6#$Dz8$@WV5p8kTqN<-7W)Q7Gt2{KoOPK_tZ|
zf2WG~O5@{qPI+W<4f_;reuFVdO^5`ADC1!JQE|N`s3cq@(0WB!n0uh@*c{=LAd;~}
zyGK@hbF-Oo+!nN)@i*O(`@FA#u?o=~e{`4O#5}z&=UkU*50fOrzi11D^&FOqe>wii
z?*k+2|EcUs;Gx{!@KBT~>PAwLrIDT7Th=Utu?~?np@t^gFs?zgX=D${RwOY^WGh-+
z+#4$066I<rp}NtcF5!lhZvD^1^l^-7{>Sh8eYW#FXWp~S`<*%O^ZuItL1Tyqt8#tZ
zY120E;^VG`!lZn&3sPd$RkdHpU#|w+bYV)pJC|SH9g%|5IkxVTQcBA4CL0}$&}ef@
zW^Vtj%M;;_1xxP9x#ex17&4N*{ksO*_4O}xYu(p*JkL#yr}@7b)t5X?%CY<+s5_MJ
zuiqt+N_;A(_)%lumoyRFixWa-M7qK_9s6<1X?JDa9fP!+_6u~~M$5L=ipB=7(j#f<
zZ<k8E`Rwou;l+s_T|L^56YmSu4%^`QFTOq==C$v}z48r)V)i|8HET~j$njp}R%Tx6
z6z1$DcJ|+-rK;8O+M4D2OI&h9Z=KBOt2kjcN}lMJQdr(sa_4xJa;t^b;+K^1J9dTU
z7E3oumY>34J%=bs549%~_mA(|={uZNs_0?o7;-LBP(ZRnkd{-^|2|=4vUTmtByHL8
zEph`(LSEzQj68a+`d$V<45J7cyv^#|^|%fD#si1Nx!4NW*`l*{->HEWNh6-|g>-=r
zXmQ|-i}Ku$ndUeHQ^&ieT!Lf}vf6GaqW9$DJ2NWrqwPY%%4nip$@vK$nRp*_C-v<|
zuKz~ZyN&<%!NS26&x?jhy+@awJipMQ-8(X4#Ae5??U<1QMt1l9R=w9fAnEF}NYu$2
z>6<Remz*?TALWUbsLm^V8JpOI8Qrv^I{Uf`UiQ}=bwlT?m7XzzYl?d75*MLY>}Vkc
zIb*A?G*z8^IvibmBKn_u^5&T_1oey0gZS2~obf(#xk=erZGTEdQnt3DMGM+0oPwss
zj5zXD;(oWhB_T@~Ig#9@v)AKtXu3>Inmgf@A|-lD-1U>cNyl3h?ADD9)GG4}zUGPk
zZzaXe!~Kf?<~@$G?Uql3t8jy9{2!doq4=J}j9ktTxss{p6!9Ud<L0{JvuM8zT}59}
zy?q<PQ`(o7I;|2vYuA@mlwTC2VWpG0`?f+&<cL+^MokC9tZR;`s@;M`H_iw&h5ar5
zCVhp4@v?m@Lrzz?2Z>jyDERlA*xZ!=Q)KDs5O)phz>Vq3BNGoM(H|=1*Q4$^2fTZw
z(%nq1P|5Rt81}SYJpEEzMPl5VJsV5&4e)ZWKDyo<HF@#^TWD2$%#hJqrPwhn_I`~h
zrl9TX+98FE%rR>Z>1EwpkHx-AQVQc8%JMz;{H~p{=FXV>jIxvm4X*qv52e?Y-f%DJ
zxEA165GikEASQ^fH6K#d!Tpu2HP{sFs%E=e$gYd$aj$+xue6N+Wc(rAz~wUsk2`(b
z8Kvmyz%bKQxpP}~baG-rwYcYCv<u@FIev&XxIE!%Ztbxbt-Y%ng;He-ByR+Lk{8!A
z+z_?%ukrIgzuh|^o09LLIM$E(jD2g{U~B*3O~s^?p1O(7xg6;i3B@l87#4eO$$oiS
znHnuA9vGDnw~@NpSw1YYZjoo+HWTzC%$-J_E}3wK-(9hvP0Ct}242U82Wv+8>kHOi
zlkR<=>ZBTU*8RF_d#Bl@zZsRIhx<%~Z@Z<pYsoy05ZE@HkOT*OyM_H}bO0QHT>=ik
z>adw3!DK(8R|q$vy{FTxw%#xliD~6qXmY^7_9kthVPTF~Xy1CfBqbU~?1QmxmU=+k
z(ggxvEuA;0e&+ci-zQR{-f7aO{O(Pz_OsEjLh_K>MbvoZ4nxtk5u{g@nPv)cgW_R}
z9}EA4K4@z0?7ue}Z(o~R(X&FjejUI2g~08PH1E4w>9o{)S(?1>Z0XMvTb|;&EuyOE
z<Uf?|k(eh=|5A0k%+DyPOynyZIUEys#os=5y;pE3-eqjU+vfn|kx^`PvS0aFgK5k7
z_Ws8b<tF{v{r8Xc%Ra(S^vGriKjcqYF_IFKBCZ&>GvWNpYX)Nv<8|a^;<iw`qCF!m
zJCer*R!Lka?@SE&ch5f_idG-0J0#H0t`-WqI6fU-<8)0T>1>bh#&znEcl-r!T#pn=
z4$?Yudha6F%4b>*8@=BdtXXY4N+`U4Dmx$}>HeVJk-QdTG@t!tVT#0(LeV0gvqyyw
z2sEp^9eY0N`u10Tm4n8No&A=)IeEC|gnmEXoNSzu!1<4R<%-9kY_8~5Ej?zReg<ow
z_S`;&)5*<v9D*b@Pp375jJ+bUt(~O-SF0ZSb>Mn78wuMs#;i&eUA0Zk_RXQ3b&TT}
z;SCI<r<Tr9OC%fOR>=7-FUB@*&;8|n>(_g^HGf3@QODE3LpmX~ELnymQm{Sx9xrKS
zK29p~?v@R$0=v6Dr5aW>-!{+h@?Q58|Kz8{{W`%J+lDAdb&M5VHrX_m<yIVSusgG)
z`wE|gu8*tGFN+9LZP$c*%%oTIyT7Y#Uu$+WtVYvbCQ+Do^ID=OntZUS+AP2A;pDLp
zQ|q{WRobah5mlF}4!P`?SD*ypcWDw;D;8QgDGN?GxP&*+636N@_L%TF<fCxBbhCW%
zM%&xYBGf(}%YX|$hc1=>DY;1-JLnf)ezmPau$)1;=`-FU=-r-83tX=C`S#}GZufju
zQ>sXNT0Ny=k@nc%cFnvA_i4SC)?_ORXHq8B4D%el1uPX`c~uG#S1M7C+*MMqLw78E
zhY2dI8@+N^qrM<pEkuRyo-$3h*azHIX|CuJeg6U1uTYr#f1L)jm7pty!Nt_EpVqGj
zXVf`s*T3XSv0ipIVh~5QdLCYp1wi6^@nTR33ob<X9tfmOm*uFzZ-27JIbc;RY)sW`
zt!7sXsMOap1pmxDHwCgCeJ^w>I1+;TUd<Y7V_}N3cTlx9g%Oxl!1(@Fz@fhB!X!Qg
zzGte&a;gDDb7s`2pRO@2w9ly`vje6Ilj<$_c7{OhbUJ}K%$c%`!Wu9kSA#`Xja47q
z=~M~uTQ&ejWO4`vDE9|h6MO?f*d<f1pCzFOx6YSGxl|H(I2h0=%!FyILZ_|=bX<Z@
zIXy76kKLDpG=TR2T<cl5;7+F|gWhKYZ346vNMyq9`PzDJfsBPN=&eq$MKd*arcmkB
zATW410h$o^5JE{IECTR`<Q+_;Q1BqjI5Ciw%m8kGTdmE2GB82|h<4gEtNm!8e#?mt
z;D<+GLqmLk>a(vGqGSRyU{Fnm`aqrr7bz4<dKN=G5TxM1z~0~yR6MN!z}y8FQ<9oh
z=+qK`&H;`)dq`^^SX>2c5xsOO-~oZpkzorD1g}Y<6rk&3>PsSGy}W?MtqFky@A(X#
zIuNZK0cK?^=;PUAu>j0#HtjbHCV*6?jzA&OoE$*Jlga*}LF`SF?WLhv1O|zqC<>*>
zYB;#lsYKx0&kH@BFpW8n*yDcc6?;_zaJs<-jPSkCsSX-!aV=P5kUgF@Nu<{a%#K*F
z134Q{9|YX7X(v$62_cY3^G%t~rD>Q0z@)1|zs)vjJ6Jq9;7#Ki`w+eS**En?7;n&7
zu==V3T&eFboN3ZiMx3D8qYc;VjFUk_H-WWCau(VFXSQf~viH0L$<p$oTrv;PAp(HR
zxGYwoQ{`RRg4u%PEm#VL7~lyq<6`h+F9OK~tPR1wo}q|fJ3M>gwD$<h61N|-us1_A
zl+PEzjP+uR3A<ynvirg<hO=WL=vh8&(Wl2haO~h*nJ_e*eGq{@?#~H&b}m8~6;8Z^
zpbmt5cVjrE;ei2}0ANsjD@<R3Rp?ZF=p4ZLJsD20%)C2Oh4~(z31DYTGiF#ITp7;7
z!>UfFHqNcgN`x}M+YQ6RnN<+@t>JUp#)9YOkqst-Ga?{FsDpEeX0(5v{0J~SEbWiL
zXC2}M4?UH@u&|;%0y`eb33ldo4~z-x8zY!oVmV=c+f$m?RfDC35mdQ2E>Pze7KWP-
z>!Bh<&57I+O_^s}9Tg^k)h7{xx@0a0IA~GAOt2yy!X%Q$1rt~LbTB6@Du!_0%HV>N
zlf)QI1&gvERKwso23mJ!Ou6ZS#zCS5W`gxE5T>C#E|{i<1D35C222I33?Njaz`On7
zi<+VWFP6D{e-{yiN#M|Jgk<44u1TiMI78S5W`Sdb5f+{zu34s{CfWN7a3Cf^@L%!&
zN$?|!!9j2c)j$~+R6n#891w-z8(!oBpL2K=+%a$r2|~8-(vQj5_XT`<0Ksf;oP+tz
z9CObS!0m)Tgg`K#xBM8B(|Z)Wb&DYL{WTYv`;A=q6~Nnx2+!lTIXtj8J7dZE!P_{z
z#f8w6F}^!?^KE#+ZDv+xd5O&3EmomZzsv?>E-~ygGum45fk!SBN&|eo1rKw^?aZJ4
E2O(~oYXATM

literal 0
HcmV?d00001

diff --git a/samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.properties b/samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..be52383ef
--- /dev/null
+++ b/samples/interactiveBrowserSample/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/samples/interactiveBrowserSample/gradlew b/samples/interactiveBrowserSample/gradlew
new file mode 100644
index 000000000..4f906e0c8
--- /dev/null
+++ b/samples/interactiveBrowserSample/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/samples/interactiveBrowserSample/gradlew.bat b/samples/interactiveBrowserSample/gradlew.bat
new file mode 100644
index 000000000..107acd32c
--- /dev/null
+++ b/samples/interactiveBrowserSample/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From 945913bf7c7dee6c119d6f1150887f8c4a485d70 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:51:03 -0500
Subject: [PATCH 054/213] - removes dependency on simple json as it was not
 adding value - fixes reference to tokencrendtial

---
 .../src/main/java/interactiveBrowserMain.java | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index 522316340..057045a54 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -3,14 +3,10 @@
 import java.util.List;
 import com.azure.identity.InteractiveBrowserCredential;
 import com.azure.identity.InteractiveBrowserCredentialBuilder;
-import com.google.gson.annotations.JsonAdapter;
 import com.microsoft.graph.authentication.*;
 import okhttp3.*;
 import com.microsoft.graph.httpcore.HttpClients;
 import com.microsoft.graph.exceptions.*;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 
 public class interactiveBrowserMain {
 
@@ -28,27 +24,20 @@ public static void main(String args[]) throws Exception {
 
     private static void interactiveBrowser() throws AuthenticationException{
 
-        InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
+        final InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
                 .clientId(CLIENT_ID)
                 .port(8765)
                 .build();
 
-        TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(interactiveBrowserCredential,SCOPES);
-        OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
+        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(SCOPES, interactiveBrowserCredential);
+        final OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
 
-        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
+        final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
 
         httpClient.newCall(request).enqueue(new Callback() {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
-                JSONParser jsonParser = new JSONParser();
-                JSONObject responseJson = null;
-                try {
-                    responseJson = (JSONObject) jsonParser.parse(response.body().string());
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-                System.out.println(responseJson);
+                System.out.println(response.body().string());
             }
 
             @Override

From d76692c96d8d12987817daefc9ea785c449afd39 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:54:42 -0500
Subject: [PATCH 055/213] - adds missing wrapper jar

---
 .../gradle/wrapper/gradle-wrapper.jar           | Bin 0 -> 59203 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.jar

diff --git a/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.jar b/samples/deviceCodeSample/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f
GIT binary patch
literal 59203
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
E2O(~oYXATM

literal 0
HcmV?d00001


From 52cc61cc22616260d2dc93084848f55b1070f876 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:55:13 -0500
Subject: [PATCH 056/213] - adds github action workflow to validate that
 samples build

---
 .github/workflows/sample-build-check.yml | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/sample-build-check.yml

diff --git a/.github/workflows/sample-build-check.yml b/.github/workflows/sample-build-check.yml
new file mode 100644
index 000000000..83cf163d4
--- /dev/null
+++ b/.github/workflows/sample-build-check.yml
@@ -0,0 +1,35 @@
+name: "samples build check"
+
+on:
+  push:
+    paths:
+      - '**/*.java'
+      - '**/*.yml'
+
+jobs:
+  samples-build-check-device-code:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 15
+    - name: Add execution right to the script
+      run: chmod +x gradlew
+      working-directory: ./samples/deviceCodeSample
+    - name: Build and run type summary project
+      run: ./gradlew --no-daemon build'
+      working-directory: ./samples/deviceCodeSample
+  samples-build-check-interactive:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 15
+    - name: Add execution right to the script
+      run: chmod +x gradlew
+      working-directory: ./samples/interactiveBrowserSample
+    - name: Build and run type summary project
+      run: ./gradlew --no-daemon build'
+      working-directory: ./samples/interactiveBrowserSample
\ No newline at end of file

From e85001d23bb20ee485015d62b19d86ad184939f4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 09:56:43 -0500
Subject: [PATCH 057/213] - removes quote breaking workflow

---
 .github/workflows/sample-build-check.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sample-build-check.yml b/.github/workflows/sample-build-check.yml
index 83cf163d4..59fc25902 100644
--- a/.github/workflows/sample-build-check.yml
+++ b/.github/workflows/sample-build-check.yml
@@ -18,7 +18,7 @@ jobs:
       run: chmod +x gradlew
       working-directory: ./samples/deviceCodeSample
     - name: Build and run type summary project
-      run: ./gradlew --no-daemon build'
+      run: ./gradlew --no-daemon build
       working-directory: ./samples/deviceCodeSample
   samples-build-check-interactive:
     runs-on: ubuntu-latest
@@ -31,5 +31,5 @@ jobs:
       run: chmod +x gradlew
       working-directory: ./samples/interactiveBrowserSample
     - name: Build and run type summary project
-      run: ./gradlew --no-daemon build'
+      run: ./gradlew --no-daemon build
       working-directory: ./samples/interactiveBrowserSample
\ No newline at end of file

From cd5d01e16a166310563e41cde4668c3c7d74357a Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 13:10:17 -0500
Subject: [PATCH 058/213] - fixes a bug where the auth provider would add the
 JWT on wrong hostnames

---
 .../TokenCredentialAuthProvider.java          | 29 +++++++++--
 .../TokenCredentialAuthProviderTest.java      | 50 +++++++++++++++----
 2 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 68418d380..6ea2c8775 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -9,7 +9,12 @@
 import okhttp3.Request;
 import com.microsoft.graph.exceptions.ErrorConstants.*;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 
 import javax.annotation.Nonnull;
 
@@ -59,7 +64,9 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
      */
     @Override
     public void authenticateRequest(@Nonnull final IHttpRequest request) {
-        request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
+        if(ShouldAuthenticateRequest(request.getRequestUrl().toString())) {
+            request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
+        }
     }
 
     /**
@@ -71,9 +78,25 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) {
     @Override
     @Nonnull
     public Request authenticateRequest(@Nonnull final Request request) {
-        return request.newBuilder()
+        if(ShouldAuthenticateRequest(request.url().toString())) {
+            return request.newBuilder()
                     .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
                     .build();
+        } else {
+            return request;
+        }
+    }
+
+    private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
+    private boolean ShouldAuthenticateRequest(@Nonnull final String requestUrl) {
+        try {
+            final URL url = new URL(requestUrl);
+            final String hostName = url.getHost().toLowerCase(Locale.getDefault());
+            return validGraphHostNames.contains(hostName);
+        } catch (MalformedURLException ex) {
+            return false;
+        }
+        
     }
 
     /**
@@ -81,7 +104,7 @@ public Request authenticateRequest(@Nonnull final Request request) {
      *
      * @return String representing the retrieved AccessToken
      */
-    String getAccessToken() {
+    private String getAccessToken() {
         String accessToken = null;
         try {
             AccessToken token = this.tokenCredential.getToken(this.context).block();
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 9d6278c42..300128b40 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -2,16 +2,12 @@
 
 import com.azure.core.credential.TokenCredential;
 import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.httpcore.IHttpRequest;
 import com.microsoft.graph.mocks.MockIHttpRequest;
 import com.microsoft.graph.mocks.MockTokenCredential;
-import com.microsoft.graph.options.HeaderOption;
 import okhttp3.Request;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.List;
-
 import static org.junit.Assert.*;
 
 public class TokenCredentialAuthProviderTest {
@@ -22,13 +18,13 @@ public class TokenCredentialAuthProviderTest {
     public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
 
         //Arrange
-        Request request = new Request.Builder().url("https://localhost").build();
-        TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+        final Request request = new Request.Builder().url("https://graph.microsoft.com").build();
+        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         //Act
         Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
-        Request authenticatedRequest = authProvider.authenticateRequest(request);
+        final Request authenticatedRequest = authProvider.authenticateRequest(request);
 
         //Assert
         Assert.assertEquals(request.url(), authenticatedRequest.url());
@@ -40,9 +36,9 @@ public void TokenCredentialAuthProviderTestICoreAuthentication() throws Authenti
     public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException {
 
         //Arrange
-        TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        MockIHttpRequest request = new MockIHttpRequest("https://localhost");
-        TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+        final MockIHttpRequest request = new MockIHttpRequest("https://graph.microsoft.com");
+        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         //Act
         Assert.assertTrue(request.getHeaders().isEmpty());
@@ -52,4 +48,36 @@ public void TokenCredentialAuthProviderTestIAuthentication() throws Authenticati
         Assert.assertTrue(request.getHeaders().get(0).getName().equals(AuthConstants.AUTHORIZATION_HEADER));
         Assert.assertTrue(request.getHeaders().get(0).getValue().equals(AuthConstants.BEARER + this.testToken));
     }
+    @Test
+    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreAuthentication() throws AuthenticationException {
+
+        //Arrange
+        final Request request = new Request.Builder().url("https://localhost").build();
+        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+
+        //Act
+        Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
+        final Request authenticatedRequest = authProvider.authenticateRequest(request);
+
+        //Assert
+        Assert.assertEquals(request.url(), authenticatedRequest.url());
+        Assert.assertNull(authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
+    }
+
+    @Test
+    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestIAuthentication() throws AuthenticationException {
+
+        //Arrange
+        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+        final MockIHttpRequest request = new MockIHttpRequest("https://localhost");
+        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+
+        //Act
+        Assert.assertTrue(request.getHeaders().isEmpty());
+        authProvider.authenticateRequest(request);
+
+        //Assert
+        Assert.assertTrue(request.getHeaders().isEmpty());
+    }
 }

From 4622566c4c7c61d5591d12893fac21d8988d3e59 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 26 Nov 2020 14:04:18 -0500
Subject: [PATCH 059/213] - fixes an issue where authentication could hand
 forvever

---
 .../IAuthenticationProvider.java              |  3 +-
 .../ICoreAuthenticationProvider.java          |  4 ++-
 .../TokenCredentialAuthProvider.java          | 35 ++++++++++++++-----
 .../graph/exceptions/ErrorConstants.java      |  2 ++
 .../graph/httpcore/AuthenticationHandler.java | 10 ++++--
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index a23446ffc..37dd4d4e2 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Nonnull;
 
+import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.IHttpRequest;
 
 public interface IAuthenticationProvider {
@@ -11,6 +12,6 @@ public interface IAuthenticationProvider {
      *
      * @param request the request to authenticate
      */
-    void authenticateRequest(@Nonnull final IHttpRequest request);
+    void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException;
 
 }
diff --git a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
index be55cb206..d551bcde4 100644
--- a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
@@ -4,6 +4,8 @@
 
 import javax.annotation.Nonnull;
 
+import com.microsoft.graph.exceptions.AuthenticationException;
+
 public interface ICoreAuthenticationProvider {
     /**
      * Authenticates the request
@@ -12,5 +14,5 @@ public interface ICoreAuthenticationProvider {
      * @return Request with Authorization header added to it
      */
     @Nonnull
-    Request authenticateRequest(@Nonnull final Request request);
+    Request authenticateRequest(@Nonnull final Request request) throws AuthenticationException;
 }
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 6ea2c8775..4ac43cbe7 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -5,12 +5,14 @@
 import com.azure.core.credential.TokenRequestContext;
 import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.exceptions.Error;
+import com.microsoft.graph.exceptions.ErrorConstants;
 import com.microsoft.graph.httpcore.IHttpRequest;
 import okhttp3.Request;
 import com.microsoft.graph.exceptions.ErrorConstants.*;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -24,6 +26,8 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     private TokenCredential tokenCredential;
     //Context options which can be optionally set by the user
     private TokenRequestContext context;
+    // maximum delay to wait for token obtention
+    private Duration tokenBlockTimeout;
 
     
     //TODO: Upon further review from Peter, this should include a Null check in the case that this is the first request
@@ -43,6 +47,7 @@ public  TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredenti
 
         this.tokenCredential = tokenCredential;
         this.context = new TokenRequestContext();
+        this.tokenBlockTimeout = Duration.ofMinutes(10);
     }
 
     /**
@@ -57,13 +62,27 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
         this.context.setScopes(scopes);
     }
 
+    /**
+     * Creates an Authentication provider using a TokenCredential and list of scopes
+     *
+     * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
+     * @param scopes Specified desired scopes of the Auth Provider
+     * @param tokenObtentionTimeout Maximum time to wait for token obtention. Default 10 minutes. Use lower value on application with stable connectivity and no user interactions.
+     * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
+     */
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout, @Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
+        this(tokenCredential);
+        this.context.setScopes(scopes);
+        this.tokenBlockTimeout = tokenObtentionTimeout;
+    }
+
     /**
      * Authenticates the request
      *
      * @param request the request to authenticate
      */
     @Override
-    public void authenticateRequest(@Nonnull final IHttpRequest request) {
+    public void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException {
         if(ShouldAuthenticateRequest(request.getRequestUrl().toString())) {
             request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
         }
@@ -77,7 +96,7 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) {
      */
     @Override
     @Nonnull
-    public Request authenticateRequest(@Nonnull final Request request) {
+    public Request authenticateRequest(@Nonnull final Request request) throws AuthenticationException {
         if(ShouldAuthenticateRequest(request.url().toString())) {
             return request.newBuilder()
                     .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
@@ -104,14 +123,12 @@ private boolean ShouldAuthenticateRequest(@Nonnull final String requestUrl) {
      *
      * @return String representing the retrieved AccessToken
      */
-    private String getAccessToken() {
-        String accessToken = null;
+    private String getAccessToken() throws AuthenticationException {
         try {
-            AccessToken token = this.tokenCredential.getToken(this.context).block();
-            accessToken = token.getToken();
-        } catch (Exception e) {
-            e.printStackTrace();
+            final AccessToken token = this.tokenCredential.getToken(this.context).block(this.tokenBlockTimeout);
+            return token.getToken();
+        } catch (RuntimeException e) {
+            throw new AuthenticationException(new Error(ErrorConstants.Codes.GeneralException, ErrorConstants.Messages.AuthTimeOut), e);
         }
-        return  accessToken;
     }
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
index 6951f90b4..e2392fe57 100644
--- a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
+++ b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
@@ -15,5 +15,7 @@ public static class Codes {
     public static class Messages {
         @Nonnull
         public final static String NullParameter = "%s parameter cannot be null.";
+        @Nonnull
+        public final static String AuthTimeOut = "Authentication failed or timed out.";
     }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index 20014d6a9..b9cd80350 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -3,6 +3,8 @@
 import java.io.IOException;
 
 import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.exceptions.AuthenticationException;
+
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
@@ -32,8 +34,12 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
 			originalRequest = originalRequest.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
 		originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 		
-		Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
-		return chain.proceed(authenticatedRequest);
+		try {
+			final Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
+			return chain.proceed(authenticatedRequest);
+		} catch (AuthenticationException ex) {
+			throw new IOException(ex);
+		}
 	}
 
 }

From aa11695e3904ca530135b9937a8df57e613a2c9b Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 7 Dec 2020 15:00:59 -0500
Subject: [PATCH 060/213] - fixes collection to include missing dependencies
 file

---
 .azure-pipelines/buildAndPackage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index 417ca04dd..d8c8b94b2 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -84,7 +84,7 @@ steps:
       gradlew.bat
       settings.gradle
       gradle.properties
-      **/gradle/wrapper/*
+      **/gradle/*
       Scripts/getLatestVersion.ps1
     TargetFolder: '$(Build.ArtifactStagingDirectory)/'
 

From 1293e96badc4e4a80e03d06b95872261243d02aa Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 7 Dec 2020 15:01:32 -0500
Subject: [PATCH 061/213] - adds feature/v2 as CI

---
 .azure-pipelines/buildAndPackage.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index d8c8b94b2..d2f59ba6c 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -9,6 +9,7 @@ trigger:
       - dev
       - main
       - master
+      - feature/v2
   paths:
     include:
       - src/*

From 2e27d2e9d50bfb152287762bf6905c66da5e4eae Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 7 Dec 2020 15:09:50 -0500
Subject: [PATCH 062/213] - attempt at fixing minimatch pattern

---
 .azure-pipelines/buildAndPackage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index d2f59ba6c..2069f3577 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -85,7 +85,7 @@ steps:
       gradlew.bat
       settings.gradle
       gradle.properties
-      **/gradle/*
+      **/gradle/**
       Scripts/getLatestVersion.ps1
     TargetFolder: '$(Build.ArtifactStagingDirectory)/'
 

From 5246e7e02248764dd35342478545a75fc2a6111f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 4 Jan 2021 10:47:51 -0500
Subject: [PATCH 063/213] - adds missing javadoc comments

---
 .../graph/content/MSBatchRequestContent.java  | 19 ++--
 .../graph/content/MSBatchRequestStep.java     | 31 +++++-
 .../graph/content/MSBatchResponseContent.java | 21 ++--
 .../graph/httpcore/AuthenticationHandler.java | 22 +++--
 .../graph/httpcore/ChaosHttpHandler.java      | 18 ++--
 .../microsoft/graph/httpcore/HttpClients.java | 15 +--
 .../httpcore/ICoreAuthenticationProvider.java |  5 +-
 .../graph/httpcore/RedirectHandler.java       | 55 ++++++-----
 .../graph/httpcore/RetryHandler.java          | 97 +++++++++++++------
 .../graph/httpcore/TelemetryHandler.java      | 22 +++++
 .../middlewareoption/IMiddlewareControl.java  |  3 +
 .../middlewareoption/IShouldRedirect.java     |  8 ++
 .../middlewareoption/IShouldRetry.java        | 11 +++
 .../middlewareoption/MiddlewareType.java      | 27 ++++--
 .../middlewareoption/RedirectOptions.java     | 40 +++++---
 .../middlewareoption/RetryOptions.java        | 53 ++++++----
 .../middlewareoption/TelemetryOptions.java    | 52 ++++++++--
 17 files changed, 360 insertions(+), 139 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index 127281c37..8e5a7a6ec 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -24,13 +24,18 @@
 import okhttp3.RequestBody;
 import okio.Buffer;
 
+/**
+ * Represents the content of a batch request
+ */
 public class MSBatchRequestContent {
 	private final LinkedHashMap<String, MSBatchRequestStep> batchRequestStepsHashMap;
 
-	// Maximum number of requests that can be sent in a batch
+	/**
+     * Maximum number of requests that can be sent in a batch
+     */
 	public static final int MAX_NUMBER_OF_REQUESTS = 20;
 
-	/*
+	/**
 	 * Creates Batch request content using list provided
 	 *
 	 * @param batchRequestStepsArray List of batch steps for batching
@@ -44,16 +49,16 @@ public MSBatchRequestContent(@Nonnull final List<MSBatchRequestStep> batchReques
 			addBatchRequestStep(requestStep);
 	}
 
-	/*
+	/**
 	 * Creates empty batch request content
 	 */
 	public MSBatchRequestContent() {
 		this.batchRequestStepsHashMap = new LinkedHashMap<>();
 	}
 
-	/*
+	/**
+     * Adds a step to the current batch
 	 * @param batchRequestStep Batch request step adding to batch content
-	 *
 	 * @return true or false based on addition or no addition of batch request step
 	 * given
 	 */
@@ -83,7 +88,7 @@ public String addBatchRequestStep(@Nonnull final Request request, @Nullable fina
 			throw new IllegalArgumentException("unable to add step to batch. Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
 	}
 
-	/*
+	/**
 	 * @param requestId Id of Batch request step to be removed
 	 *
 	 * @return true or false based on removal or no removal of batch request step
@@ -104,7 +109,7 @@ public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
 		return removed;
 	}
 
-	/*
+	/**
 	 * @return Batch request content's json as String
 	 */
 	@Nonnull
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
index 509701db2..df456c76f 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
@@ -7,11 +7,20 @@
 
 import okhttp3.Request;
 
+/**
+ * Respresents a step in a batch request
+ */
 public class MSBatchRequestStep {
 	private String requestId;
 	private Request request;
 	private List<String> arrayOfDependsOnIds;
-	
+
+    /**
+     * Initializes a batch step from a raw HTTP request
+     * @param requestId the id to assign to this step
+     * @param request the request to send in the batch
+     * @param arrayOfDependsOnIds the ids of steps this step depends on
+     */
 	public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final List<String> arrayOfDependsOnIds) {
 		if(requestId == null)
 			throw new IllegalArgumentException("Request Id cannot be null.");
@@ -19,22 +28,34 @@ public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Reques
 			throw new IllegalArgumentException("Request Id cannot be empty.");
 		if(request == null)
 			new IllegalArgumentException("Request cannot be null.");
-				
+
 		this.requestId = requestId;
 		this.request = request;
 		this.arrayOfDependsOnIds = arrayOfDependsOnIds;
 	}
-	
+
+    /**
+     * Gets the current step ID
+     * @return the current step ID
+     */
 	@Nonnull
 	public String getRequestId() {
 		return requestId;
 	}
-	
+
+    /**
+     * Gets the raw HTTP request representation for the step
+     * @return the raw HTTP request representation for the step
+     */
 	@Nonnull
 	public Request getRequest() {
 		return request;
 	}
-	
+
+    /**
+     * Gets the list of steps this step depends on
+     * @return the list of steps this step depends on
+     */
 	@Nullable
 	public List<String> getArrayOfDependsOnIds(){
 		return arrayOfDependsOnIds;
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index 58c1011e7..ce4ac69d9 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -21,6 +21,9 @@
 import okhttp3.ResponseBody;
 import okio.Buffer;
 
+/**
+ * Represents the response of a batch request
+ */
 public class MSBatchResponseContent {
 
 	private final Response batchResponse;
@@ -28,7 +31,7 @@ public class MSBatchResponseContent {
 	private JsonArray batchResponseArray;
 	private String nextLink;
 
-	/*
+	/**
 	 * @param batchResponse OkHttp batch response on execution of batch requests
 	 */
 	public MSBatchResponseContent(@Nullable final Response batchResponse) {
@@ -36,11 +39,11 @@ public MSBatchResponseContent(@Nullable final Response batchResponse) {
 		update(batchResponse);
 	}
 
-	/*
+	/**
 	 * Returns OkHttp Response of given request Id
-	 * 
+	 *
 	 * @param requestId Request Id of batch step
-	 * 
+	 *
 	 * @return OkHttp Response corresponding to requestId
 	 */
 	@Nullable
@@ -107,7 +110,7 @@ public Response getResponseById(@Nonnull final String requestId) {
 
 	/**
 	 * Get map of id and responses
-	 * 
+	 *
 	 * @return responses in Map of id and response
 	 */
 	@Nonnull
@@ -123,7 +126,7 @@ public Map<String, Response> getResponses() {
 
 	/**
 	 * Get iterator over the responses
-	 * 
+	 *
 	 * @return iterator for responses
 	 */
 	@Nullable
@@ -132,6 +135,10 @@ public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
 		return responsesMap != null ? responsesMap.entrySet().iterator() : null;
 	}
 
+    /**
+     * Updates the response content using the raw http response object
+     * @param batchResponse the response from the service.
+     */
 	public void update(@Nonnull final Response batchResponse) {
 		if (batchResponse == null)
 			throw new IllegalArgumentException("Batch Response cannot be null");
@@ -169,7 +176,7 @@ public void update(@Nonnull final Response batchResponse) {
 		}
 	}
 
-	/*
+	/**
 	 * @return nextLink of batch response
 	 */
 	@Nullable
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index f5230ac94..e3b2d297b 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -12,13 +12,23 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
+/**
+ * Interceptor responsible for injecting the token in the request headers
+ */
 public class AuthenticationHandler implements Interceptor {
-	
-	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.AUTHENTICATION;
+
+    /**
+     * The current middleware type
+     */
+    public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.AUTHENTICATION;
 
 	private ICoreAuthenticationProvider authProvider;
-	
-	public AuthenticationHandler(@Nonnull final ICoreAuthenticationProvider authProvider) {
+
+    /**
+     * Initialize a the handler with a authentication provider
+     * @param authProvider the authentication provider to use
+     */
+    public AuthenticationHandler(@Nonnull final ICoreAuthenticationProvider authProvider) {
 		this.authProvider = authProvider;
 	}
 
@@ -26,11 +36,11 @@ public AuthenticationHandler(@Nonnull final ICoreAuthenticationProvider authProv
 	@Nullable
 	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request originalRequest = chain.request();
-		
+
 		if(originalRequest.tag(TelemetryOptions.class) == null)
 			originalRequest = originalRequest.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
 		originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
-		
+
 		Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
 		return chain.proceed(authenticatedRequest);
 	}
diff --git a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
index d056abb77..89a8cb30d 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
@@ -21,8 +21,11 @@
  * interceptor that randomly fails the responses for unit testing purposes
  */
 public class ChaosHttpHandler implements Interceptor {
+    /**
+     * The current middleware type
+     */
 	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.RETRY;
-	/*
+	/**
 	 * constant string being used
 	 */
 	private final String RETRY_AFTER = "Retry-After";
@@ -38,17 +41,20 @@ public class ChaosHttpHandler implements Interceptor {
 	 * body to respond on failed requests
 	 */
 	private final String responseBody = "{\"error\": {\"code\": \"TooManyRequests\",\"innerError\": {\"code\": \"429\",\"date\": \"2020-08-18T12:51:51\",\"message\": \"Please retry after\",\"request-id\": \"94fb3b52-452a-4535-a601-69e0a90e3aa2\",\"status\": \"429\"},\"message\": \"Please retry again later.\"}}";
-	public static final int MSClientErrorCodeTooManyRequests = 429;
-	
+    /**
+     * Too many requests status code
+     */
+    public static final int MSClientErrorCodeTooManyRequests = 429;
+
 	@Override
 	@Nullable
 	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
-		
+
 		if(request.tag(TelemetryOptions.class) == null)
 			request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
 		request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
-		
+
 		final Integer dice = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);
 
 		if(dice % failureRate == 0) {
@@ -66,4 +72,4 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
 		}
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index d1e92aa47..22415a01a 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -10,6 +10,9 @@
 import okhttp3.Protocol;
 import okhttp3.OkHttpClient.Builder;
 
+/**
+ * Builder to get a custom HttpClient to be used for requests against Microsoft Graph
+ */
 public class HttpClients {
     private HttpClients() {
         super();
@@ -18,7 +21,7 @@ private HttpClients() {
     /**
      * Creates builder object for construction of custom
      * {@link OkHttpClient} instances.
-     * 
+     *
      * @return OkHttpClient.Builder() custom builder for developer to add its own interceptors to it
      */
     @Nonnull
@@ -32,9 +35,9 @@ public static Builder custom() {
     /**
      * Creates {@link OkHttpClient} instance with default
      * configuration and provided authProvider
-     * 
+     *
      * @param auth Use IAuthenticationProvider instance provided while constructing http client
-     * @return OkHttpClient build with authentication provider given, default redirect and default retry handlers 
+     * @return OkHttpClient build with authentication provider given, default redirect and default retry handlers
      */
     @Nonnull
     public static OkHttpClient createDefault(@Nonnull final ICoreAuthenticationProvider auth) {
@@ -44,12 +47,12 @@ public static OkHttpClient createDefault(@Nonnull final ICoreAuthenticationProvi
     			.addInterceptor(new RedirectHandler())
     			.build();
     }
-    
+
     /**
      * Creates {@link OkHttpClient} instance with interceptors
-     * 
+     *
      * @param interceptors Use interceptors provided while constructing http client
-     * @return OkHttpClient build with interceptors provided 
+     * @return OkHttpClient build with interceptors provided
      */
     @Nonnull
     public static OkHttpClient createFromInterceptors(@Nullable final Interceptor[] interceptors) {
diff --git a/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
index be9afbe0e..64718ccd8 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ICoreAuthenticationProvider.java
@@ -4,10 +4,13 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * Authenticates requests to be sent to the API
+ */
 public interface ICoreAuthenticationProvider {
     /**
      * Authenticates the request
-     * 
+     *
      * @param request the request to authenticate
      * @return Request with Authorization header added to it
      */
diff --git a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
index b3d88ee7d..16c0e6fc3 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
@@ -21,20 +21,27 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
+/**
+ * Middleware that determines whether a redirect information should be followed or not, and follows it if necessary.
+ */
 public class RedirectHandler implements Interceptor{
-	
+
+    /**
+     * The current middleware type
+     */
 	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.REDIRECT;
-	
+
 	private RedirectOptions mRedirectOptions;
-	
-	/*
+
+	/**
 	 * Initialize using default redirect options, default IShouldRedirect and max redirect value
 	 */
 	public RedirectHandler() {
 		this(null);
 	}
-	
-	/*
+
+	/**
+     * Initialize using custom redirect options.
 	 * @param redirectOptions pass instance of redirect options to be used
 	 */
 	public RedirectHandler(@Nullable final RedirectOptions redirectOptions) {
@@ -43,16 +50,16 @@ public RedirectHandler(@Nullable final RedirectOptions redirectOptions) {
 			this.mRedirectOptions = new RedirectOptions();
 		}
 	}
-	
+
     boolean isRedirected(Request request, Response response, int redirectCount, RedirectOptions redirectOptions) throws IOException {
         // Check max count of redirects reached
     	if(redirectCount > redirectOptions.maxRedirects()) return false;
-    	
+
     	// Location header empty then don't redirect
         final String locationHeader = response.header("location");
         if(locationHeader == null)
         	return false;
-        
+
         // If any of 301,302,303,307,308 then redirect
         final int statusCode = response.code();
         if(statusCode == HTTP_PERM_REDIRECT || //308
@@ -61,16 +68,16 @@ boolean isRedirected(Request request, Response response, int redirectCount, Redi
         		statusCode == HTTP_SEE_OTHER || //303
         		statusCode == HTTP_MOVED_TEMP) //302
         	return true;
-        
+
         return false;
     }
-    
+
     Request getRedirect(
     		final Request request,
-    		final Response userResponse) throws ProtocolException {    	
+    		final Response userResponse) throws ProtocolException {
         String location = userResponse.header("Location");
         if (location == null || location.length() == 0) return null;
-        
+
         // For relative URL in location header, the new url to redirect is relative to original request
         if(location.startsWith("/")) {
         	if(request.url().toString().endsWith("/")) {
@@ -78,14 +85,14 @@ Request getRedirect(
         	}
         	location = request.url() + location;
         }
-        
+
         HttpUrl requestUrl = userResponse.request().url();
-        
+
         HttpUrl locationUrl = userResponse.request().url().resolve(location);
-        
+
         // Don't follow redirects to unsupported protocols.
         if (locationUrl == null) return null;
-        
+
         // Most redirects don't include a request body.
         Request.Builder requestBuilder = userResponse.request().newBuilder();
 
@@ -97,7 +104,7 @@ Request getRedirect(
         if (!sameScheme || !sameHost) {
           requestBuilder.removeHeader("Authorization");
         }
-        
+
         // Response status code 303 See Other then POST changes to GET
         if(userResponse.code() == HTTP_SEE_OTHER) {
         	requestBuilder.method("GET", null);
@@ -111,28 +118,28 @@ Request getRedirect(
 	@Nullable
 	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
-		
+
 		if(request.tag(TelemetryOptions.class) == null)
 			request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
 		request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
-		
+
 		Response response = null;
 		int requestsCount = 1;
-		
+
 		// Use should retry pass along with this request
 		RedirectOptions redirectOptions = request.tag(RedirectOptions.class);
 		redirectOptions = redirectOptions != null ? redirectOptions : this.mRedirectOptions;
-		
+
 		while(true) {
 			response = chain.proceed(request);
 			boolean shouldRedirect = isRedirected(request, response, requestsCount, redirectOptions)
 					&& redirectOptions.shouldRedirect().shouldRedirect(response);
 			if(!shouldRedirect) break;
-			
+
 			Request followup = getRedirect(request, response);
 			if(followup == null) break;
 			request = followup;
-		
+
 			requestsCount++;
 		}
 		return response;
diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index 8d156183e..361f7a6cb 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -14,30 +14,63 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
+/**
+ * The middleware responsible for retrying requests when they fail because of transient issues
+ */
 public class RetryHandler implements Interceptor{
-	
+
+    /**
+     * Type of the current middleware
+     */
 	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.RETRY;
 
     private RetryOptions mRetryOption;
-    
-    /*
-     * constant string being used
+
+    /**
+     * Header name to track the retry attempt number
      */
     private final String RETRY_ATTEMPT_HEADER = "Retry-Attempt";
+    /**
+     * Header name for the retry after information
+     */
     private final String RETRY_AFTER = "Retry-After";
+    /**
+     * Header name for the transfer information
+     */
     private final String TRANSFER_ENCODING = "Transfer-Encoding";
+    /**
+     * Chunked encoding header value
+     */
     private final String TRANSFER_ENCODING_CHUNKED = "chunked";
+    /**
+     * Binary content type header value
+     */
     private final String APPLICATION_OCTET_STREAM = "application/octet-stream";
+    /**
+     * Header name for the content type
+     */
     private final String CONTENT_TYPE = "Content-Type";
-    
+
+    /**
+     * Too many requests status code
+     */
     public static final int MSClientErrorCodeTooManyRequests = 429;
+    /**
+     * Service unavailable status code
+     */
     public static final int MSClientErrorCodeServiceUnavailable  = 503;
+    /**
+     * Gateway timeout status code
+     */
     public static final int MSClientErrorCodeGatewayTimeout = 504;
-    
+
+    /**
+     * One second as milliseconds
+     */
     private final long DELAY_MILLISECONDS = 1000;
-    
-    /*
-     * @retryOption Create Retry handler using retry option
+
+    /**
+     * @param retryOption Create Retry handler using retry option
      */
     public RetryHandler(@Nullable final RetryOptions retryOption) {
         this.mRetryOption = retryOption;
@@ -45,34 +78,34 @@ public RetryHandler(@Nullable final RetryOptions retryOption) {
         	this.mRetryOption = new RetryOptions();
         }
     }
-    /*
+    /**
      * Initialize retry handler with default retry option
      */
     public RetryHandler() {
         this(null);
     }
-    
+
 	boolean retryRequest(Response response, int executionCount, Request request, RetryOptions retryOptions) {
-		
+
 		// Should retry option
 		// Use should retry common for all requests
 		IShouldRetry shouldRetryCallback = null;
 		if(retryOptions != null) {
 			shouldRetryCallback = retryOptions.shouldRetry();
 		}
-		
+
 		boolean shouldRetry = false;
 		// Status codes 429 503 504
 		int statusCode = response.code();
-		// Only requests with payloads that are buffered/rewindable are supported. 
-		// Payloads with forward only streams will be have the responses returned 
+		// Only requests with payloads that are buffered/rewindable are supported.
+		// Payloads with forward only streams will be have the responses returned
 		// without any retry attempt.
-		shouldRetry = 
-				(executionCount <= retryOptions.maxRetries()) 
+		shouldRetry =
+				(executionCount <= retryOptions.maxRetries())
 				&& checkStatus(statusCode) && isBuffered(response, request)
-				&& shouldRetryCallback != null 
+				&& shouldRetryCallback != null
 				&& shouldRetryCallback.shouldRetry(retryOptions.delay(), executionCount, request, response);
-		
+
 		if(shouldRetry) {
 			long retryInterval = getRetryAfter(response, retryOptions.delay(), executionCount);
 			try {
@@ -83,7 +116,7 @@ && checkStatus(statusCode) && isBuffered(response, request)
 		}
 		return shouldRetry;
 	}
-	
+
 	/**
 	 * Get retry after in milliseconds
 	 * @param response Response
@@ -103,28 +136,28 @@ long getRetryAfter(Response response, long delay, int executionCount) {
 		}
 		return (long)Math.min(retryDelay, RetryOptions.MAX_DELAY * DELAY_MILLISECONDS);
 	}
-	
+
 	boolean checkStatus(int statusCode) {
-	    return (statusCode == MSClientErrorCodeTooManyRequests || statusCode == MSClientErrorCodeServiceUnavailable 
+	    return (statusCode == MSClientErrorCodeTooManyRequests || statusCode == MSClientErrorCodeServiceUnavailable
 	    		|| statusCode == MSClientErrorCodeGatewayTimeout);
 	}
-	
+
 	boolean isBuffered(Response response, Request request) {
 		String methodName = request.method();
-		if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE") || methodName.equalsIgnoreCase("HEAD") || methodName.equalsIgnoreCase("OPTIONS")) 
+		if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE") || methodName.equalsIgnoreCase("HEAD") || methodName.equalsIgnoreCase("OPTIONS"))
 			return true;
-		
+
 		boolean isHTTPMethodPutPatchOrPost = methodName.equalsIgnoreCase("POST") ||
 				methodName.equalsIgnoreCase("PUT") ||
 				methodName.equalsIgnoreCase("PATCH");
-		
+
 		if(isHTTPMethodPutPatchOrPost) {
 			boolean isStream = response.header(CONTENT_TYPE)!=null && response.header(CONTENT_TYPE).equalsIgnoreCase(APPLICATION_OCTET_STREAM);
 			if(!isStream) {
 				String transferEncoding = response.header(TRANSFER_ENCODING);
-				boolean isTransferEncodingChunked = (transferEncoding != null) && 
+				boolean isTransferEncodingChunked = (transferEncoding != null) &&
 						transferEncoding.equalsIgnoreCase(TRANSFER_ENCODING_CHUNKED);
-				
+
 				if(request.body() != null && isTransferEncodingChunked)
 					return true;
 			}
@@ -136,17 +169,17 @@ boolean isBuffered(Response response, Request request) {
 	@Nullable
 	public Response intercept(@Nonnull final Chain chain) throws IOException {
 		Request request = chain.request();
-		
+
 		if(request.tag(TelemetryOptions.class) == null)
 			request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
 		request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
-		
+
 		Response response = chain.proceed(request);
-		
+
 		// Use should retry pass along with this request
 		RetryOptions retryOption = request.tag(RetryOptions.class);
 		retryOption = retryOption != null ? retryOption : mRetryOption;
-		
+
 		int executionCount = 1;
 		while(retryRequest(response, executionCount, request, retryOption)) {
 			request = request.newBuilder().addHeader(RETRY_ATTEMPT_HEADER, String.valueOf(executionCount)).build();
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
index 194f74501..c86820737 100644
--- a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -12,13 +12,35 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
+/**
+ * Middleware responsible for adding telemetry information on SDK usage
+ * Note: the telemetry only collects anonymous information on SDK version and usage. No personal information is collected.
+ */
 public class TelemetryHandler implements Interceptor{
 
+    /**
+     * Http request header to send the telemetry infromation with
+     */
     public static final String SDK_VERSION = "SdkVersion";
+    /**
+     * Current SDK version
+     */
     public static final String VERSION = "v1.0.6";
+    /**
+     * Verion prefix
+     */
     public static final String GRAPH_VERSION_PREFIX = "graph-java-core";
+    /**
+     * Java version prefix
+     */
     public static final String JAVA_VERSION_PREFIX = "java";
+    /**
+     * Android version prefix
+     */
     public static final String ANDROID_VERSION_PREFIX = "android";
+    /**
+     * The client request ID header
+     */
     public static final String CLIENT_REQUEST_ID = "client-request-id";
 
 	@Override
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IMiddlewareControl.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IMiddlewareControl.java
index 699c8d152..70f3a301c 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IMiddlewareControl.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IMiddlewareControl.java
@@ -1,5 +1,8 @@
 package com.microsoft.graph.httpcore.middlewareoption;
 
+/**
+ * Option to be passed to one of the middlewares provided by this SDK
+ */
 public interface IMiddlewareControl {
 
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
index dab75623b..e9683e883 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
@@ -4,6 +4,14 @@
 
 import okhttp3.Response;
 
+/**
+ * Indicates whether a specific response redirect information should be followed
+ */
 public interface IShouldRedirect {
+    /**
+     * Determines whether to follow the redirect information
+     * @param response current response
+     * @return whether the handler should follow the redirect information
+     */
 	boolean shouldRedirect(@Nonnull final Response response);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
index 90ab05284..e12fecd24 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
@@ -5,6 +5,17 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * Indicates whether a specific request should be retried
+ */
 public interface IShouldRetry {
+    /**
+     * Determines whether a specific request should be retried
+     * @param delay the delay to wait before retrying
+     * @param executionCount number of retry attempts
+     * @param request current request
+     * @param response current response
+     * @return whether the specific request should be retried by the handler
+     */
 	boolean shouldRetry(long delay, int executionCount, @Nonnull final Request request, @Nonnull final Response response);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java
index 193ab9d1b..f5e402da0 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java
@@ -1,16 +1,27 @@
 package com.microsoft.graph.httpcore.middlewareoption;
 
+/**
+ * The type of middleware to applied to the request/response
+ */
 public enum MiddlewareType {
-	
-	//Authentication Middleware
+
+	/**
+     * Authentication Middleware
+     */
 	AUTHENTICATION,
-	
-	//Redirect Middleware
+
+	/**
+     * Redirect Middleware
+     */
 	REDIRECT,
-	
-	//Retry Middleware
+
+	/**
+     * Retry Middleware
+     */
 	RETRY,
-	
-	//Not supported
+
+	/**
+     * Not supported
+     */
 	NOT_SUPPORTED
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
index 0444db9f3..510437e93 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
@@ -5,27 +5,39 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
+/**
+ * Options to be passed to the redirect middleware.
+ */
 public class RedirectOptions implements IMiddlewareControl{
-	private int maxRedirects;
-	public static final int DEFAULT_MAX_REDIRECTS = 5;
+    private int maxRedirects;
+    /**
+     * The default maximum number of redirects to follow
+     */
+    public static final int DEFAULT_MAX_REDIRECTS = 5;
+    /**
+     * The absolute maxium number of redirects that can be followed
+     */
 	public static final int MAX_REDIRECTS = 20;
-	
-	private IShouldRedirect shouldRedirect;
+
+    private IShouldRedirect shouldRedirect;
+    /**
+     * Default redirect evaluation, always follow redirect information.
+     */
 	public static final IShouldRedirect DEFAULT_SHOULD_REDIRECT = new IShouldRedirect() {
 		@Override
 		public boolean shouldRedirect(Response response) {
 			return true;
 		}
-	}; 
-	
-	/*
+	};
+
+	/**
 	 * Create default instance of redirect options, with default values of max redirects and should redirect
 	 */
 	public RedirectOptions() {
 		this(DEFAULT_MAX_REDIRECTS, DEFAULT_SHOULD_REDIRECT);
 	}
-	
-	/*
+
+	/**
 	 * @param maxRedirects Max redirects to occur
 	 * @param shouldRedirect Should redirect callback called before every redirect
 	 */
@@ -34,19 +46,19 @@ public RedirectOptions(int maxRedirects, @Nullable final IShouldRedirect shouldR
 			throw new IllegalArgumentException("Max redirects cannot be negative");
 		if(maxRedirects > MAX_REDIRECTS)
 			throw new IllegalArgumentException("Max redirect cannot exceed " + MAX_REDIRECTS);
-		
+
 		this.maxRedirects = maxRedirects;
 		this.shouldRedirect = shouldRedirect != null ? shouldRedirect : DEFAULT_SHOULD_REDIRECT;
 	}
-	
-	/*
+
+	/**
 	 * @return max redirects
 	 */
 	public int maxRedirects() {
 		return this.maxRedirects;
 	}
-	
-	/*
+
+	/**
 	 * @return should redirect
 	 */
 	@Nonnull
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
index 69ad5db26..d365dc1ab 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
@@ -6,34 +6,53 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
+/**
+ * The options to be passed to the retry middleware.
+ */
 public class RetryOptions implements IMiddlewareControl {
-	private IShouldRetry mShouldretry;
+    private IShouldRetry mShouldretry;
+    /**
+     * Default retry evaluation, always retry.
+     */
 	public static final IShouldRetry DEFAULT_SHOULD_RETRY = new IShouldRetry() {
 		@Override
 		public boolean shouldRetry(long delay, int executionCount, Request request, Response response) {
 			return true;
 		}
 	};
-	
+
     private int mMaxRetries;
+    /**
+     * Absolute maximum number of retries
+     */
     public static final int MAX_RETRIES = 10;
+    /**
+     * Default maximum number of retries
+     */
     public static final int DEFAULT_MAX_RETRIES = 3;
-    
-    /*
+
+    /**
      * Delay in seconds
      */
     private long mDelay;
-    public static final long DEFAULT_DELAY = 3; // 3 seconds default delay
-    public static final long MAX_DELAY = 180; // 180 second max delay
-    
-    /*
+    /**
+     * Default retry delay
+     */
+    public static final long DEFAULT_DELAY = 3;
+    /**
+     * Absolute maximum retry delay
+     */
+    public static final long MAX_DELAY = 180;
+
+    /**
      * Create default instance of retry options, with default values of delay, max retries and shouldRetry callback.
      */
 	public RetryOptions(){
 		this(DEFAULT_SHOULD_RETRY, DEFAULT_MAX_RETRIES, DEFAULT_DELAY);
 	}
-	
-	/*
+
+	/**
+     * Create an instance with provided values
 	 * @param shouldRetry Retry callback to be called before making a retry
 	 * @param maxRetries Number of max retires for a request
 	 * @param delay Delay in seconds between retries
@@ -48,28 +67,28 @@ public RetryOptions(@Nullable final IShouldRetry shouldRetry, int maxRetries, lo
 			throw new IllegalArgumentException("Max retries cannot exceed " + MAX_RETRIES);
 		if(maxRetries < 0)
 			throw new IllegalArgumentException("Max retries cannot be negative");
-		
+
 		this.mShouldretry = shouldRetry != null ? shouldRetry : DEFAULT_SHOULD_RETRY;
 		this.mMaxRetries = maxRetries;
 		this.mDelay = delay;
 	}
-	
-	/*
+
+	/**
 	 * @return should retry callback
 	 */
 	@Nonnull
 	public IShouldRetry shouldRetry() {
 		return mShouldretry;
 	}
-	
-	/*
+
+	/**
 	 * @return Number of max retries
 	 */
 	public int maxRetries() {
 		return mMaxRetries;
 	}
-	
-	/*
+
+	/**
 	 * @return Delay in seconds between retries
 	 */
 	public long delay() {
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
index 415fe509c..24348f2eb 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
@@ -4,35 +4,75 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * Options to be passed to the telemetry middleware.
+ */
 public class TelemetryOptions {
 
-	public static final int NONE_FLAG = 0;
-	public static final int REDIRECT_HANDLER_ENABLED_FLAG = 1;
-	public static final int RETRY_HANDLER_ENABLED_FLAG = 2;
-	public static final int AUTH_HANDLER_ENABLED_FLAG = 4;
-	public static final int DEFAULT_HTTPROVIDER_ENABLED_FLAG = 8;
+    /**
+     * No SDK feature in use
+     */
+    public static final int NONE_FLAG = 0;
+    /**
+     * Redirect handler enabled
+     */
+    public static final int REDIRECT_HANDLER_ENABLED_FLAG = 1;
+    /**
+     * Retry handler enabled
+     */
+    public static final int RETRY_HANDLER_ENABLED_FLAG = 2;
+    /**
+     * Authentication handler enabled
+     */
+    public static final int AUTH_HANDLER_ENABLED_FLAG = 4;
+    /**
+     * Default http provider enabled
+     */
+    public static final int DEFAULT_HTTPROVIDER_ENABLED_FLAG = 8;
+    /**
+     * Logging handler enabled
+     */
 	public static final int LOGGING_HANDLER_ENABLED_FLAG = 16;
 
 	private int featureUsage = NONE_FLAG;
 	private String clientRequestId;
 
+    /**
+     * Sets a numeric representation of the SDK feature usage
+     * @param flag a numeric representation of the SDK feature usage
+     */
 	public void setFeatureUsage(int flag) {
 		featureUsage = featureUsage | flag;
 	}
 
+    /**
+     * Gets a numeric representation of the SDK feature usage
+     * @return a numeric representation of the SDK feature usage
+     */
 	public int getFeatureUsage() {
 		return featureUsage;
 	}
 
+    /**
+     * Gets a serialized representation of the SDK feature usage.
+     * @return a serialized representation of the SDK feature usage
+     */
 	@Nonnull
 	public String getSerializedFeatureUsage() {
 		return Integer.toHexString(featureUsage);
 	}
 
+    /**
+     * Sets the client request id
+     * @param clientRequestId the client request id to set, preferably the string representation of a GUID
+     */
 	public void setClientRequestId(@Nonnull final String clientRequestId) {
 		this.clientRequestId = clientRequestId;
 	}
-
+    /**
+     * Gets the client request id
+     * @return the client request id
+     */
 	@Nonnull
 	public String getClientRequestId() {
 		if(clientRequestId == null) {

From 9ee028e060b09875a6f9a95d14b718d3e7d888ec Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 4 Jan 2021 10:51:48 -0500
Subject: [PATCH 064/213] - fixes a mix of tabs and spaces

---
 .../graph/content/MSBatchRequestContent.java  | 312 ++++++------
 .../graph/content/MSBatchRequestStep.java     |  54 +-
 .../graph/content/MSBatchResponseContent.java | 430 ++++++++--------
 .../graph/httpcore/AuthenticationHandler.java |  26 +-
 .../graph/httpcore/ChaosHttpHandler.java      |  78 +--
 .../microsoft/graph/httpcore/HttpClients.java |  20 +-
 .../graph/httpcore/RedirectHandler.java       | 124 ++---
 .../graph/httpcore/RetryHandler.java          | 216 ++++----
 .../graph/httpcore/TelemetryHandler.java      |   6 +-
 .../middlewareoption/IShouldRedirect.java     |   2 +-
 .../middlewareoption/IShouldRetry.java        |   2 +-
 .../middlewareoption/MiddlewareType.java      |  16 +-
 .../middlewareoption/RedirectOptions.java     |  76 +--
 .../middlewareoption/RetryOptions.java        |  94 ++--
 .../middlewareoption/TelemetryOptions.java    |  46 +-
 .../content/MSBatchRequestContentTest.java    | 130 ++---
 .../graph/content/MSBatchRequestStepTest.java |  20 +-
 .../content/MSBatchResponseContentTest.java   | 212 ++++----
 .../httpcore/AuthenticationHandlerTest.java   |  60 +--
 .../graph/httpcore/HttpClientsTest.java       |  50 +-
 .../graph/httpcore/RedirectHandlerTest.java   | 480 +++++++++---------
 .../graph/httpcore/RetryHandlerTest.java      | 272 +++++-----
 .../graph/httpcore/TelemetryOptionsTest.java  |  82 +--
 23 files changed, 1404 insertions(+), 1404 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index 8e5a7a6ec..d227cc894 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -28,168 +28,168 @@
  * Represents the content of a batch request
  */
 public class MSBatchRequestContent {
-	private final LinkedHashMap<String, MSBatchRequestStep> batchRequestStepsHashMap;
+    private final LinkedHashMap<String, MSBatchRequestStep> batchRequestStepsHashMap;
 
-	/**
+    /**
      * Maximum number of requests that can be sent in a batch
      */
-	public static final int MAX_NUMBER_OF_REQUESTS = 20;
-
-	/**
-	 * Creates Batch request content using list provided
-	 *
-	 * @param batchRequestStepsArray List of batch steps for batching
-	 */
-	public MSBatchRequestContent(@Nonnull final List<MSBatchRequestStep> batchRequestStepsArray) {
-		if (batchRequestStepsArray.size() > MAX_NUMBER_OF_REQUESTS)
-			throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
-
-		this.batchRequestStepsHashMap = new LinkedHashMap<>();
-		for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
-			addBatchRequestStep(requestStep);
-	}
-
-	/**
-	 * Creates empty batch request content
-	 */
-	public MSBatchRequestContent() {
-		this.batchRequestStepsHashMap = new LinkedHashMap<>();
-	}
-
-	/**
+    public static final int MAX_NUMBER_OF_REQUESTS = 20;
+
+    /**
+     * Creates Batch request content using list provided
+     *
+     * @param batchRequestStepsArray List of batch steps for batching
+     */
+    public MSBatchRequestContent(@Nonnull final List<MSBatchRequestStep> batchRequestStepsArray) {
+        if (batchRequestStepsArray.size() > MAX_NUMBER_OF_REQUESTS)
+            throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
+
+        this.batchRequestStepsHashMap = new LinkedHashMap<>();
+        for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
+            addBatchRequestStep(requestStep);
+    }
+
+    /**
+     * Creates empty batch request content
+     */
+    public MSBatchRequestContent() {
+        this.batchRequestStepsHashMap = new LinkedHashMap<>();
+    }
+
+    /**
      * Adds a step to the current batch
-	 * @param batchRequestStep Batch request step adding to batch content
-	 * @return true or false based on addition or no addition of batch request step
-	 * given
-	 */
-	public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchRequestStep) {
-		if (batchRequestStepsHashMap.containsKey(batchRequestStep.getRequestId()) ||
-			batchRequestStepsHashMap.size() >= MAX_NUMBER_OF_REQUESTS)
-			return false;
-		batchRequestStepsHashMap.put(batchRequestStep.getRequestId(), batchRequestStep);
-		return true;
-	}
-
-	/**
-	 * Add steps to batch from OkHttp.Request
-	 * @param request the request to add to the batch
-	 * @param arrayOfDependsOnIds ids of steps this step depends on
-	 * @return the step id
-	 */
-	@Nonnull
-	public String addBatchRequestStep(@Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
-		String requestId;
-		do {
-			requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
-		} while(batchRequestStepsHashMap.keySet().contains(requestId));
-		if(addBatchRequestStep(new MSBatchRequestStep(requestId, request, Arrays.asList(arrayOfDependsOnIds))))
-			return requestId;
-		else
-			throw new IllegalArgumentException("unable to add step to batch. Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
-	}
-
-	/**
-	 * @param requestId Id of Batch request step to be removed
-	 *
-	 * @return true or false based on removal or no removal of batch request step
-	 * with given id
-	 */
-	public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
-		boolean removed = false;
-		if (batchRequestStepsHashMap.containsKey(requestId)) {
-			batchRequestStepsHashMap.remove(requestId);
-			removed = true;
-			for (final Map.Entry<String, MSBatchRequestStep> steps : batchRequestStepsHashMap.entrySet()) {
-				if (steps.getValue() != null && steps.getValue().getArrayOfDependsOnIds() != null) {
-					while (steps.getValue().getArrayOfDependsOnIds().remove(requestId))
-						;
-				}
-			}
-		}
-		return removed;
-	}
-
-	/**
-	 * @return Batch request content's json as String
-	 */
-	@Nonnull
-	public String getBatchRequestContent() {
-		final JsonObject batchRequestContentMap = new JsonObject();
-		final JsonArray batchContentArray = new JsonArray();
-		for (final Map.Entry<String, MSBatchRequestStep> requestStep : batchRequestStepsHashMap.entrySet()) {
-			batchContentArray.add(getBatchRequestObjectFromRequestStep(requestStep.getValue()));
-		}
-		batchRequestContentMap.add("requests", batchContentArray);
-
-		final String content = batchRequestContentMap.toString();
-		return content;
-	}
-
-	private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
-	private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep batchRequestStep) {
-		final JsonObject contentmap = new JsonObject();
-		contentmap.add("id", new JsonPrimitive(batchRequestStep.getRequestId()));
+     * @param batchRequestStep Batch request step adding to batch content
+     * @return true or false based on addition or no addition of batch request step
+     * given
+     */
+    public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchRequestStep) {
+        if (batchRequestStepsHashMap.containsKey(batchRequestStep.getRequestId()) ||
+            batchRequestStepsHashMap.size() >= MAX_NUMBER_OF_REQUESTS)
+            return false;
+        batchRequestStepsHashMap.put(batchRequestStep.getRequestId(), batchRequestStep);
+        return true;
+    }
+
+    /**
+     * Add steps to batch from OkHttp.Request
+     * @param request the request to add to the batch
+     * @param arrayOfDependsOnIds ids of steps this step depends on
+     * @return the step id
+     */
+    @Nonnull
+    public String addBatchRequestStep(@Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
+        String requestId;
+        do {
+            requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
+        } while(batchRequestStepsHashMap.keySet().contains(requestId));
+        if(addBatchRequestStep(new MSBatchRequestStep(requestId, request, Arrays.asList(arrayOfDependsOnIds))))
+            return requestId;
+        else
+            throw new IllegalArgumentException("unable to add step to batch. Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
+    }
+
+    /**
+     * @param requestId Id of Batch request step to be removed
+     *
+     * @return true or false based on removal or no removal of batch request step
+     * with given id
+     */
+    public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
+        boolean removed = false;
+        if (batchRequestStepsHashMap.containsKey(requestId)) {
+            batchRequestStepsHashMap.remove(requestId);
+            removed = true;
+            for (final Map.Entry<String, MSBatchRequestStep> steps : batchRequestStepsHashMap.entrySet()) {
+                if (steps.getValue() != null && steps.getValue().getArrayOfDependsOnIds() != null) {
+                    while (steps.getValue().getArrayOfDependsOnIds().remove(requestId))
+                        ;
+                }
+            }
+        }
+        return removed;
+    }
+
+    /**
+     * @return Batch request content's json as String
+     */
+    @Nonnull
+    public String getBatchRequestContent() {
+        final JsonObject batchRequestContentMap = new JsonObject();
+        final JsonArray batchContentArray = new JsonArray();
+        for (final Map.Entry<String, MSBatchRequestStep> requestStep : batchRequestStepsHashMap.entrySet()) {
+            batchContentArray.add(getBatchRequestObjectFromRequestStep(requestStep.getValue()));
+        }
+        batchRequestContentMap.add("requests", batchContentArray);
+
+        final String content = batchRequestContentMap.toString();
+        return content;
+    }
+
+    private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
+    private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep batchRequestStep) {
+        final JsonObject contentmap = new JsonObject();
+        contentmap.add("id", new JsonPrimitive(batchRequestStep.getRequestId()));
 
         final Matcher protocolAndHostReplacementMatcher = protocolAndHostReplacementPattern.matcher(batchRequestStep.getRequest().url().toString());
 
-		final String url =  protocolAndHostReplacementMatcher.replaceAll("");
-		contentmap.add("url", new JsonPrimitive(url));
-
-		contentmap.add("method", new JsonPrimitive(batchRequestStep.getRequest().method().toString()));
-
-		final Headers headers = batchRequestStep.getRequest().headers();
-		if (headers != null && headers.size() != 0) {
-			final JsonObject headerMap = new JsonObject();
-			for (final Map.Entry<String, List<String>> entry : headers.toMultimap().entrySet()) {
-				headerMap.add(entry.getKey(), new JsonPrimitive(getHeaderValuesAsString(entry.getValue())));
-			}
-			contentmap.add("headers", headerMap);
-		}
-
-		final List<String> arrayOfDependsOnIds = batchRequestStep.getArrayOfDependsOnIds();
-		if (arrayOfDependsOnIds != null) {
-			final JsonArray array = new JsonArray();
-			for (final String dependsOnId : arrayOfDependsOnIds)
-				array.add(dependsOnId);
-			contentmap.add("dependsOn", array);
-		}
-
-		final RequestBody body = batchRequestStep.getRequest().body();
-		if (body != null) {
-			try {
-				contentmap.add("body", requestBodyToJSONObject(batchRequestStep.getRequest()));
-			} catch (IOException | JsonParseException e) {
-				e.printStackTrace();
-			}
-		}
-		return contentmap;
-	}
-
-	private String getHeaderValuesAsString(final List<String> list) {
-		if (list == null || list.size() == 0)
-			return "";
-		final StringBuilder builder = new StringBuilder(list.get(0));
-		for (int i = 1; i < list.size(); i++) {
-			builder.append(";");
-			builder.append(list.get(i));
-		}
-		return builder.toString();
-	}
-
-	private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
-		if (request == null || request.body() == null)
-			return null;
-		final Request copy = request.newBuilder().build();
-		final Buffer buffer = new Buffer();
-		copy.body().writeTo(buffer);
-		final String requestBody = buffer.readUtf8();
-		if(requestBody == null || requestBody == "")
-			return null;
-		final JsonElement requestBodyElement = JsonParser.parseString(requestBody);
-		if(requestBodyElement == null || !requestBodyElement.isJsonObject())
-			return null;
-		else
-			return requestBodyElement.getAsJsonObject();
-	}
+        final String url =  protocolAndHostReplacementMatcher.replaceAll("");
+        contentmap.add("url", new JsonPrimitive(url));
+
+        contentmap.add("method", new JsonPrimitive(batchRequestStep.getRequest().method().toString()));
+
+        final Headers headers = batchRequestStep.getRequest().headers();
+        if (headers != null && headers.size() != 0) {
+            final JsonObject headerMap = new JsonObject();
+            for (final Map.Entry<String, List<String>> entry : headers.toMultimap().entrySet()) {
+                headerMap.add(entry.getKey(), new JsonPrimitive(getHeaderValuesAsString(entry.getValue())));
+            }
+            contentmap.add("headers", headerMap);
+        }
+
+        final List<String> arrayOfDependsOnIds = batchRequestStep.getArrayOfDependsOnIds();
+        if (arrayOfDependsOnIds != null) {
+            final JsonArray array = new JsonArray();
+            for (final String dependsOnId : arrayOfDependsOnIds)
+                array.add(dependsOnId);
+            contentmap.add("dependsOn", array);
+        }
+
+        final RequestBody body = batchRequestStep.getRequest().body();
+        if (body != null) {
+            try {
+                contentmap.add("body", requestBodyToJSONObject(batchRequestStep.getRequest()));
+            } catch (IOException | JsonParseException e) {
+                e.printStackTrace();
+            }
+        }
+        return contentmap;
+    }
+
+    private String getHeaderValuesAsString(final List<String> list) {
+        if (list == null || list.size() == 0)
+            return "";
+        final StringBuilder builder = new StringBuilder(list.get(0));
+        for (int i = 1; i < list.size(); i++) {
+            builder.append(";");
+            builder.append(list.get(i));
+        }
+        return builder.toString();
+    }
+
+    private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
+        if (request == null || request.body() == null)
+            return null;
+        final Request copy = request.newBuilder().build();
+        final Buffer buffer = new Buffer();
+        copy.body().writeTo(buffer);
+        final String requestBody = buffer.readUtf8();
+        if(requestBody == null || requestBody == "")
+            return null;
+        final JsonElement requestBodyElement = JsonParser.parseString(requestBody);
+        if(requestBodyElement == null || !requestBodyElement.isJsonObject())
+            return null;
+        else
+            return requestBodyElement.getAsJsonObject();
+    }
 
 }
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
index df456c76f..808bee280 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
@@ -11,9 +11,9 @@
  * Respresents a step in a batch request
  */
 public class MSBatchRequestStep {
-	private String requestId;
-	private Request request;
-	private List<String> arrayOfDependsOnIds;
+    private String requestId;
+    private Request request;
+    private List<String> arrayOfDependsOnIds;
 
     /**
      * Initializes a batch step from a raw HTTP request
@@ -21,43 +21,43 @@ public class MSBatchRequestStep {
      * @param request the request to send in the batch
      * @param arrayOfDependsOnIds the ids of steps this step depends on
      */
-	public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final List<String> arrayOfDependsOnIds) {
-		if(requestId == null)
-			throw new IllegalArgumentException("Request Id cannot be null.");
-		if(requestId.length() == 0)
-			throw new IllegalArgumentException("Request Id cannot be empty.");
-		if(request == null)
-			new IllegalArgumentException("Request cannot be null.");
-
-		this.requestId = requestId;
-		this.request = request;
-		this.arrayOfDependsOnIds = arrayOfDependsOnIds;
-	}
+    public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final List<String> arrayOfDependsOnIds) {
+        if(requestId == null)
+            throw new IllegalArgumentException("Request Id cannot be null.");
+        if(requestId.length() == 0)
+            throw new IllegalArgumentException("Request Id cannot be empty.");
+        if(request == null)
+            new IllegalArgumentException("Request cannot be null.");
+
+        this.requestId = requestId;
+        this.request = request;
+        this.arrayOfDependsOnIds = arrayOfDependsOnIds;
+    }
 
     /**
      * Gets the current step ID
      * @return the current step ID
      */
-	@Nonnull
-	public String getRequestId() {
-		return requestId;
-	}
+    @Nonnull
+    public String getRequestId() {
+        return requestId;
+    }
 
     /**
      * Gets the raw HTTP request representation for the step
      * @return the raw HTTP request representation for the step
      */
-	@Nonnull
-	public Request getRequest() {
-		return request;
-	}
+    @Nonnull
+    public Request getRequest() {
+        return request;
+    }
 
     /**
      * Gets the list of steps this step depends on
      * @return the list of steps this step depends on
      */
-	@Nullable
-	public List<String> getArrayOfDependsOnIds(){
-		return arrayOfDependsOnIds;
-	}
+    @Nullable
+    public List<String> getArrayOfDependsOnIds(){
+        return arrayOfDependsOnIds;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index ce4ac69d9..7ca6c6585 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -26,246 +26,246 @@
  */
 public class MSBatchResponseContent {
 
-	private final Response batchResponse;
-	private LinkedHashMap<String, Request> batchRequestsHashMap;
-	private JsonArray batchResponseArray;
-	private String nextLink;
+    private final Response batchResponse;
+    private LinkedHashMap<String, Request> batchRequestsHashMap;
+    private JsonArray batchResponseArray;
+    private String nextLink;
 
-	/**
-	 * @param batchResponse OkHttp batch response on execution of batch requests
-	 */
-	public MSBatchResponseContent(@Nullable final Response batchResponse) {
-		this.batchResponse = batchResponse;
-		update(batchResponse);
-	}
+    /**
+     * @param batchResponse OkHttp batch response on execution of batch requests
+     */
+    public MSBatchResponseContent(@Nullable final Response batchResponse) {
+        this.batchResponse = batchResponse;
+        update(batchResponse);
+    }
 
-	/**
-	 * Returns OkHttp Response of given request Id
-	 *
-	 * @param requestId Request Id of batch step
-	 *
-	 * @return OkHttp Response corresponding to requestId
-	 */
-	@Nullable
-	public Response getResponseById(@Nonnull final String requestId) {
-		if (batchResponseArray == null)
-			return null;
+    /**
+     * Returns OkHttp Response of given request Id
+     *
+     * @param requestId Request Id of batch step
+     *
+     * @return OkHttp Response corresponding to requestId
+     */
+    @Nullable
+    public Response getResponseById(@Nonnull final String requestId) {
+        if (batchResponseArray == null)
+            return null;
 
-		final JsonArray responses = batchResponseArray;
+        final JsonArray responses = batchResponseArray;
 
-		for (final JsonElement response : responses) {
-			if(!response.isJsonObject())
-				continue;
-			final JsonObject jsonresponse = response.getAsJsonObject();
-			final JsonElement idElement = jsonresponse.get("id");
-			if (idElement != null && idElement.isJsonPrimitive()) {
-				final String id = idElement.getAsString();
-				if (id.compareTo(requestId) == 0) {
-					final Response.Builder builder = new Response.Builder();
+        for (final JsonElement response : responses) {
+            if(!response.isJsonObject())
+                continue;
+            final JsonObject jsonresponse = response.getAsJsonObject();
+            final JsonElement idElement = jsonresponse.get("id");
+            if (idElement != null && idElement.isJsonPrimitive()) {
+                final String id = idElement.getAsString();
+                if (id.compareTo(requestId) == 0) {
+                    final Response.Builder builder = new Response.Builder();
 
-					// Put corresponding request into the constructed response
-					builder.request(batchRequestsHashMap.get(requestId));
-					// copy protocol and message same as of batch response
-					builder.protocol(batchResponse.protocol());
-					builder.message(batchResponse.message());
+                    // Put corresponding request into the constructed response
+                    builder.request(batchRequestsHashMap.get(requestId));
+                    // copy protocol and message same as of batch response
+                    builder.protocol(batchResponse.protocol());
+                    builder.message(batchResponse.message());
 
-					// Put status code of the corresponding request in JsonArray
-					final JsonElement statusElement = jsonresponse.get("status");
-					if (statusElement != null && statusElement.isJsonPrimitive()) {
-						final Long status = statusElement.getAsLong();
-						builder.code(status.intValue());
-					}
+                    // Put status code of the corresponding request in JsonArray
+                    final JsonElement statusElement = jsonresponse.get("status");
+                    if (statusElement != null && statusElement.isJsonPrimitive()) {
+                        final Long status = statusElement.getAsLong();
+                        builder.code(status.intValue());
+                    }
 
-					// Put body from response array for corresponding id into constructing response
-					final JsonElement jsonBodyElement = jsonresponse.get("body");
-					if (jsonBodyElement != null && jsonBodyElement.isJsonObject()) {
-						final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
-						final String bodyAsString = JsonObject.toString();
-						final ResponseBody responseBody = ResponseBody
-								.create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
-						builder.body(responseBody);
-					}
+                    // Put body from response array for corresponding id into constructing response
+                    final JsonElement jsonBodyElement = jsonresponse.get("body");
+                    if (jsonBodyElement != null && jsonBodyElement.isJsonObject()) {
+                        final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
+                        final String bodyAsString = JsonObject.toString();
+                        final ResponseBody responseBody = ResponseBody
+                                .create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
+                        builder.body(responseBody);
+                    }
 
-					// Put headers from response array for corresponding id into constructing
-					// response
-					final JsonElement jsonheadersElement = jsonresponse.get("headers");
-					if (jsonheadersElement != null && jsonheadersElement.isJsonObject()) {
-						final JsonObject jsonheaders = jsonheadersElement.getAsJsonObject();
-						for (final String key : jsonheaders.keySet()) {
-							final JsonElement strValueElement = jsonheaders.get(key);
-							if (strValueElement != null && strValueElement.isJsonPrimitive()) {
-								final String strvalue = strValueElement.getAsString();
-								for (final String value : strvalue.split(";")) {
-									builder.header(key, value);
-								}
-							}
-						}
-					}
-					return builder.build();
-				}
-			}
-		}
-		return null;
-	}
+                    // Put headers from response array for corresponding id into constructing
+                    // response
+                    final JsonElement jsonheadersElement = jsonresponse.get("headers");
+                    if (jsonheadersElement != null && jsonheadersElement.isJsonObject()) {
+                        final JsonObject jsonheaders = jsonheadersElement.getAsJsonObject();
+                        for (final String key : jsonheaders.keySet()) {
+                            final JsonElement strValueElement = jsonheaders.get(key);
+                            if (strValueElement != null && strValueElement.isJsonPrimitive()) {
+                                final String strvalue = strValueElement.getAsString();
+                                for (final String value : strvalue.split(";")) {
+                                    builder.header(key, value);
+                                }
+                            }
+                        }
+                    }
+                    return builder.build();
+                }
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * Get map of id and responses
-	 *
-	 * @return responses in Map of id and response
-	 */
-	@Nonnull
-	public Map<String, Response> getResponses() {
-		if (batchResponseArray == null)
-			return null;
-		final Map<String, Response> responsesMap = new LinkedHashMap<>();
-		for (final String id : batchRequestsHashMap.keySet()) {
-			responsesMap.put(id, getResponseById(id));
-		}
-		return responsesMap;
-	}
+    /**
+     * Get map of id and responses
+     *
+     * @return responses in Map of id and response
+     */
+    @Nonnull
+    public Map<String, Response> getResponses() {
+        if (batchResponseArray == null)
+            return null;
+        final Map<String, Response> responsesMap = new LinkedHashMap<>();
+        for (final String id : batchRequestsHashMap.keySet()) {
+            responsesMap.put(id, getResponseById(id));
+        }
+        return responsesMap;
+    }
 
-	/**
-	 * Get iterator over the responses
-	 *
-	 * @return iterator for responses
-	 */
-	@Nullable
-	public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
-		final Map<String, Response> responsesMap = getResponses();
-		return responsesMap != null ? responsesMap.entrySet().iterator() : null;
-	}
+    /**
+     * Get iterator over the responses
+     *
+     * @return iterator for responses
+     */
+    @Nullable
+    public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
+        final Map<String, Response> responsesMap = getResponses();
+        return responsesMap != null ? responsesMap.entrySet().iterator() : null;
+    }
 
     /**
      * Updates the response content using the raw http response object
      * @param batchResponse the response from the service.
      */
-	public void update(@Nonnull final Response batchResponse) {
-		if (batchResponse == null)
-			throw new IllegalArgumentException("Batch Response cannot be null");
+    public void update(@Nonnull final Response batchResponse) {
+        if (batchResponse == null)
+            throw new IllegalArgumentException("Batch Response cannot be null");
 
-		final Map<String, Request> requestMap = createBatchRequestsHashMap(batchResponse);
-		if (batchRequestsHashMap == null)
-			batchRequestsHashMap = new LinkedHashMap<>();
-		if (requestMap != null)
-			batchRequestsHashMap.putAll(requestMap);
+        final Map<String, Request> requestMap = createBatchRequestsHashMap(batchResponse);
+        if (batchRequestsHashMap == null)
+            batchRequestsHashMap = new LinkedHashMap<>();
+        if (requestMap != null)
+            batchRequestsHashMap.putAll(requestMap);
 
-		if (batchResponse.body() != null) {
-			try {
-				final String batchResponseData = batchResponse.body().string();
-				if (batchResponseData != null) {
-					final JsonObject batchResponseObj = stringToJSONObject(batchResponseData);
-					if (batchResponseObj != null) {
+        if (batchResponse.body() != null) {
+            try {
+                final String batchResponseData = batchResponse.body().string();
+                if (batchResponseData != null) {
+                    final JsonObject batchResponseObj = stringToJSONObject(batchResponseData);
+                    if (batchResponseObj != null) {
 
-						final JsonElement nextLinkElement = batchResponseObj.get("@odata.nextLink");
-						if (nextLinkElement != null && nextLinkElement.isJsonPrimitive())
-							nextLink = nextLinkElement.getAsString();
+                        final JsonElement nextLinkElement = batchResponseObj.get("@odata.nextLink");
+                        if (nextLinkElement != null && nextLinkElement.isJsonPrimitive())
+                            nextLink = nextLinkElement.getAsString();
 
-						if (batchResponseArray == null)
-							batchResponseArray = new JsonArray();
+                        if (batchResponseArray == null)
+                            batchResponseArray = new JsonArray();
 
-						final JsonElement responseArrayElement = batchResponseObj.get("responses");
-						if (responseArrayElement != null && responseArrayElement.isJsonArray()) {
-							final JsonArray responseArray = responseArrayElement.getAsJsonArray();
-							batchResponseArray.addAll(responseArray);
-						}
-					}
-				}
-			} catch (final IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
+                        final JsonElement responseArrayElement = batchResponseObj.get("responses");
+                        if (responseArrayElement != null && responseArrayElement.isJsonArray()) {
+                            final JsonArray responseArray = responseArrayElement.getAsJsonArray();
+                            batchResponseArray.addAll(responseArray);
+                        }
+                    }
+                }
+            } catch (final IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 
-	/**
-	 * @return nextLink of batch response
-	 */
-	@Nullable
-	public String nextLink() {
-		return nextLink;
-	}
+    /**
+     * @return nextLink of batch response
+     */
+    @Nullable
+    public String nextLink() {
+        return nextLink;
+    }
 
-	private Map<String, Request> createBatchRequestsHashMap(final Response batchResponse) {
-		if (batchResponse == null)
-			return null;
-		try {
-			final Map<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
-			final JsonObject requestJSONObject = requestBodyToJSONObject(batchResponse.request());
-			final JsonElement requestArrayElement = requestJSONObject.get("requests");
-			if (requestArrayElement != null && requestArrayElement.isJsonArray()) {
-				final JsonArray requestArray = requestArrayElement.getAsJsonArray();
-				for (final JsonElement item : requestArray) {
-					if(!item.isJsonObject())
-						continue;
-					final JsonObject requestObject = item.getAsJsonObject();
+    private Map<String, Request> createBatchRequestsHashMap(final Response batchResponse) {
+        if (batchResponse == null)
+            return null;
+        try {
+            final Map<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
+            final JsonObject requestJSONObject = requestBodyToJSONObject(batchResponse.request());
+            final JsonElement requestArrayElement = requestJSONObject.get("requests");
+            if (requestArrayElement != null && requestArrayElement.isJsonArray()) {
+                final JsonArray requestArray = requestArrayElement.getAsJsonArray();
+                for (final JsonElement item : requestArray) {
+                    if(!item.isJsonObject())
+                        continue;
+                    final JsonObject requestObject = item.getAsJsonObject();
 
-					final Request.Builder builder = new Request.Builder();
+                    final Request.Builder builder = new Request.Builder();
 
-					final JsonElement urlElement = requestObject.get("url");
-					if (urlElement != null && urlElement.isJsonPrimitive()) {
-						final StringBuilder fullUrl = new StringBuilder(
-								batchResponse.request().url().toString().replace("$batch", ""));
-						fullUrl.append(urlElement.getAsString());
-						builder.url(fullUrl.toString());
-					}
-					final JsonElement jsonHeadersElement = requestObject.get("headers");
-					if (jsonHeadersElement != null && jsonHeadersElement.isJsonObject()) {
-						final JsonObject jsonheaders = jsonHeadersElement.getAsJsonObject();
-						for (final String key : jsonheaders.keySet()) {
-							final JsonElement strvalueElement = jsonheaders.get(key);
-							if (strvalueElement != null && strvalueElement.isJsonPrimitive()) {
-								final String strvalue = strvalueElement.getAsString();
-								for (final String value : strvalue.split("; ")) {
-									builder.header(key, value);
-								}
-							}
-						}
-					}
-					final JsonElement jsonBodyElement = requestObject.get("body");
-					final JsonElement jsonMethodElement = requestObject.get("method");
-					if (jsonBodyElement != null && jsonMethodElement != null
-						&& jsonBodyElement.isJsonObject() && jsonMethodElement.isJsonPrimitive()) {
-						final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
-						final String bodyAsString = JsonObject.toString();
-						final RequestBody requestBody = RequestBody
-								.create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
-						builder.method(jsonMethodElement.getAsString(), requestBody);
-					} else if (jsonMethodElement != null) {
-						builder.method(jsonMethodElement.getAsString(), null);
-					}
-					final JsonElement jsonIdElement = requestObject.get("id");
-					if (jsonIdElement != null && jsonIdElement.isJsonPrimitive()) {
-						batchRequestsHashMap.put(jsonIdElement.getAsString(), builder.build());
-					}
-				}
-			}
-			return batchRequestsHashMap;
+                    final JsonElement urlElement = requestObject.get("url");
+                    if (urlElement != null && urlElement.isJsonPrimitive()) {
+                        final StringBuilder fullUrl = new StringBuilder(
+                                batchResponse.request().url().toString().replace("$batch", ""));
+                        fullUrl.append(urlElement.getAsString());
+                        builder.url(fullUrl.toString());
+                    }
+                    final JsonElement jsonHeadersElement = requestObject.get("headers");
+                    if (jsonHeadersElement != null && jsonHeadersElement.isJsonObject()) {
+                        final JsonObject jsonheaders = jsonHeadersElement.getAsJsonObject();
+                        for (final String key : jsonheaders.keySet()) {
+                            final JsonElement strvalueElement = jsonheaders.get(key);
+                            if (strvalueElement != null && strvalueElement.isJsonPrimitive()) {
+                                final String strvalue = strvalueElement.getAsString();
+                                for (final String value : strvalue.split("; ")) {
+                                    builder.header(key, value);
+                                }
+                            }
+                        }
+                    }
+                    final JsonElement jsonBodyElement = requestObject.get("body");
+                    final JsonElement jsonMethodElement = requestObject.get("method");
+                    if (jsonBodyElement != null && jsonMethodElement != null
+                        && jsonBodyElement.isJsonObject() && jsonMethodElement.isJsonPrimitive()) {
+                        final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
+                        final String bodyAsString = JsonObject.toString();
+                        final RequestBody requestBody = RequestBody
+                                .create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
+                        builder.method(jsonMethodElement.getAsString(), requestBody);
+                    } else if (jsonMethodElement != null) {
+                        builder.method(jsonMethodElement.getAsString(), null);
+                    }
+                    final JsonElement jsonIdElement = requestObject.get("id");
+                    if (jsonIdElement != null && jsonIdElement.isJsonPrimitive()) {
+                        batchRequestsHashMap.put(jsonIdElement.getAsString(), builder.build());
+                    }
+                }
+            }
+            return batchRequestsHashMap;
 
-		} catch (IOException | JsonParseException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
+        } catch (IOException | JsonParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
-	private JsonObject stringToJSONObject(final String input) {
-		JsonObject JsonObject = null;
-		try {
-			if (input != null) {
-				JsonObject = JsonParser.parseString(input).getAsJsonObject();
-			}
-		} catch (final Exception e) {
-			e.printStackTrace();
-		}
-		return JsonObject;
-	}
+    private JsonObject stringToJSONObject(final String input) {
+        JsonObject JsonObject = null;
+        try {
+            if (input != null) {
+                JsonObject = JsonParser.parseString(input).getAsJsonObject();
+            }
+        } catch (final Exception e) {
+            e.printStackTrace();
+        }
+        return JsonObject;
+    }
 
-	private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
-		if (request == null || request.body() == null)
-			return null;
-		final Request copy = request.newBuilder().build();
-		final Buffer buffer = new Buffer();
-		copy.body().writeTo(buffer);
-		final String requestBody = buffer.readUtf8();
-		final JsonObject JsonObject = JsonParser.parseString(requestBody).getAsJsonObject();
-		return JsonObject;
-	}
+    private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
+        if (request == null || request.body() == null)
+            return null;
+        final Request copy = request.newBuilder().build();
+        final Buffer buffer = new Buffer();
+        copy.body().writeTo(buffer);
+        final String requestBody = buffer.readUtf8();
+        final JsonObject JsonObject = JsonParser.parseString(requestBody).getAsJsonObject();
+        return JsonObject;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index e3b2d297b..c23395857 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -22,27 +22,27 @@ public class AuthenticationHandler implements Interceptor {
      */
     public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.AUTHENTICATION;
 
-	private ICoreAuthenticationProvider authProvider;
+    private ICoreAuthenticationProvider authProvider;
 
     /**
      * Initialize a the handler with a authentication provider
      * @param authProvider the authentication provider to use
      */
     public AuthenticationHandler(@Nonnull final ICoreAuthenticationProvider authProvider) {
-		this.authProvider = authProvider;
-	}
+        this.authProvider = authProvider;
+    }
 
-	@Override
-	@Nullable
-	public Response intercept(@Nonnull final Chain chain) throws IOException {
-		Request originalRequest = chain.request();
+    @Override
+    @Nullable
+    public Response intercept(@Nonnull final Chain chain) throws IOException {
+        Request originalRequest = chain.request();
 
-		if(originalRequest.tag(TelemetryOptions.class) == null)
-			originalRequest = originalRequest.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-		originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
+        if(originalRequest.tag(TelemetryOptions.class) == null)
+            originalRequest = originalRequest.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
+        originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 
-		Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
-		return chain.proceed(authenticatedRequest);
-	}
+        Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
+        return chain.proceed(authenticatedRequest);
+    }
 
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
index 89a8cb30d..1a405ab9f 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
@@ -24,52 +24,52 @@ public class ChaosHttpHandler implements Interceptor {
     /**
      * The current middleware type
      */
-	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.RETRY;
-	/**
-	 * constant string being used
-	 */
-	private final String RETRY_AFTER = "Retry-After";
-	/**
-	 * Denominator for the failure rate (i.e. 1/X)
-	 */
-	private final Integer failureRate = 3;
-	/**
-	 * default value to return on retry after
-	 */
-	private final String retryAfterValue = "10";
-	/**
-	 * body to respond on failed requests
-	 */
-	private final String responseBody = "{\"error\": {\"code\": \"TooManyRequests\",\"innerError\": {\"code\": \"429\",\"date\": \"2020-08-18T12:51:51\",\"message\": \"Please retry after\",\"request-id\": \"94fb3b52-452a-4535-a601-69e0a90e3aa2\",\"status\": \"429\"},\"message\": \"Please retry again later.\"}}";
+    public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.RETRY;
+    /**
+     * constant string being used
+     */
+    private final String RETRY_AFTER = "Retry-After";
+    /**
+     * Denominator for the failure rate (i.e. 1/X)
+     */
+    private final Integer failureRate = 3;
+    /**
+     * default value to return on retry after
+     */
+    private final String retryAfterValue = "10";
+    /**
+     * body to respond on failed requests
+     */
+    private final String responseBody = "{\"error\": {\"code\": \"TooManyRequests\",\"innerError\": {\"code\": \"429\",\"date\": \"2020-08-18T12:51:51\",\"message\": \"Please retry after\",\"request-id\": \"94fb3b52-452a-4535-a601-69e0a90e3aa2\",\"status\": \"429\"},\"message\": \"Please retry again later.\"}}";
     /**
      * Too many requests status code
      */
     public static final int MSClientErrorCodeTooManyRequests = 429;
 
-	@Override
-	@Nullable
-	public Response intercept(@Nonnull final Chain chain) throws IOException {
-		Request request = chain.request();
+    @Override
+    @Nullable
+    public Response intercept(@Nonnull final Chain chain) throws IOException {
+        Request request = chain.request();
 
-		if(request.tag(TelemetryOptions.class) == null)
-			request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-		request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
+        if(request.tag(TelemetryOptions.class) == null)
+            request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
+        request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
 
-		final Integer dice = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);
+        final Integer dice = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);
 
-		if(dice % failureRate == 0) {
-			return new Response
-						.Builder()
-						.request(request)
-						.protocol(Protocol.HTTP_1_1)
-						.code(MSClientErrorCodeTooManyRequests)
-						.message("Too Many Requests")
-						.addHeader(RETRY_AFTER, retryAfterValue)
-						.body(ResponseBody.create(MediaType.get("application/json"), responseBody))
-						.build();
-		} else {
-			return chain.proceed(request);
-		}
-	}
+        if(dice % failureRate == 0) {
+            return new Response
+                        .Builder()
+                        .request(request)
+                        .protocol(Protocol.HTTP_1_1)
+                        .code(MSClientErrorCodeTooManyRequests)
+                        .message("Too Many Requests")
+                        .addHeader(RETRY_AFTER, retryAfterValue)
+                        .body(ResponseBody.create(MediaType.get("application/json"), responseBody))
+                        .build();
+        } else {
+            return chain.proceed(request);
+        }
+    }
 
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index 22415a01a..f10bbf105 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -43,9 +43,9 @@ public static Builder custom() {
     public static OkHttpClient createDefault(@Nonnull final ICoreAuthenticationProvider auth) {
         return custom()
                 .addInterceptor(new AuthenticationHandler(auth))
-    			.addInterceptor(new RetryHandler())
-    			.addInterceptor(new RedirectHandler())
-    			.build();
+                .addInterceptor(new RetryHandler())
+                .addInterceptor(new RedirectHandler())
+                .build();
     }
 
     /**
@@ -56,12 +56,12 @@ public static OkHttpClient createDefault(@Nonnull final ICoreAuthenticationProvi
      */
     @Nonnull
     public static OkHttpClient createFromInterceptors(@Nullable final Interceptor[] interceptors) {
-    	OkHttpClient.Builder builder = custom();
-    	if(interceptors != null)
-    		for(Interceptor interceptor : interceptors) {
-    			if(interceptor != null)
-    				builder.addInterceptor(interceptor);
-    		}
-    	return builder.build();
+        OkHttpClient.Builder builder = custom();
+        if(interceptors != null)
+            for(Interceptor interceptor : interceptors) {
+                if(interceptor != null)
+                    builder.addInterceptor(interceptor);
+            }
+        return builder.build();
     }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
index 16c0e6fc3..a9c95841b 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
@@ -29,61 +29,61 @@ public class RedirectHandler implements Interceptor{
     /**
      * The current middleware type
      */
-	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.REDIRECT;
+    public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.REDIRECT;
 
-	private RedirectOptions mRedirectOptions;
+    private RedirectOptions mRedirectOptions;
 
-	/**
-	 * Initialize using default redirect options, default IShouldRedirect and max redirect value
-	 */
-	public RedirectHandler() {
-		this(null);
-	}
+    /**
+     * Initialize using default redirect options, default IShouldRedirect and max redirect value
+     */
+    public RedirectHandler() {
+        this(null);
+    }
 
-	/**
+    /**
      * Initialize using custom redirect options.
-	 * @param redirectOptions pass instance of redirect options to be used
-	 */
-	public RedirectHandler(@Nullable final RedirectOptions redirectOptions) {
-		this.mRedirectOptions = redirectOptions;
-		if(redirectOptions == null) {
-			this.mRedirectOptions = new RedirectOptions();
-		}
-	}
+     * @param redirectOptions pass instance of redirect options to be used
+     */
+    public RedirectHandler(@Nullable final RedirectOptions redirectOptions) {
+        this.mRedirectOptions = redirectOptions;
+        if(redirectOptions == null) {
+            this.mRedirectOptions = new RedirectOptions();
+        }
+    }
 
     boolean isRedirected(Request request, Response response, int redirectCount, RedirectOptions redirectOptions) throws IOException {
         // Check max count of redirects reached
-    	if(redirectCount > redirectOptions.maxRedirects()) return false;
+        if(redirectCount > redirectOptions.maxRedirects()) return false;
 
-    	// Location header empty then don't redirect
+        // Location header empty then don't redirect
         final String locationHeader = response.header("location");
         if(locationHeader == null)
-        	return false;
+            return false;
 
         // If any of 301,302,303,307,308 then redirect
         final int statusCode = response.code();
         if(statusCode == HTTP_PERM_REDIRECT || //308
-        		statusCode == HTTP_MOVED_PERM || //301
-        		statusCode == HTTP_TEMP_REDIRECT || //307
-        		statusCode == HTTP_SEE_OTHER || //303
-        		statusCode == HTTP_MOVED_TEMP) //302
-        	return true;
+                statusCode == HTTP_MOVED_PERM || //301
+                statusCode == HTTP_TEMP_REDIRECT || //307
+                statusCode == HTTP_SEE_OTHER || //303
+                statusCode == HTTP_MOVED_TEMP) //302
+            return true;
 
         return false;
     }
 
     Request getRedirect(
-    		final Request request,
-    		final Response userResponse) throws ProtocolException {
+            final Request request,
+            final Response userResponse) throws ProtocolException {
         String location = userResponse.header("Location");
         if (location == null || location.length() == 0) return null;
 
         // For relative URL in location header, the new url to redirect is relative to original request
         if(location.startsWith("/")) {
-        	if(request.url().toString().endsWith("/")) {
-        		location = location.substring(1);
-        	}
-        	location = request.url() + location;
+            if(request.url().toString().endsWith("/")) {
+                location = location.substring(1);
+            }
+            location = request.url() + location;
         }
 
         HttpUrl requestUrl = userResponse.request().url();
@@ -107,41 +107,41 @@ Request getRedirect(
 
         // Response status code 303 See Other then POST changes to GET
         if(userResponse.code() == HTTP_SEE_OTHER) {
-        	requestBuilder.method("GET", null);
+            requestBuilder.method("GET", null);
         }
 
         return requestBuilder.url(locationUrl).build();
     }
 
     // Intercept request and response made to network
-	@Override
-	@Nullable
-	public Response intercept(@Nonnull final Chain chain) throws IOException {
-		Request request = chain.request();
-
-		if(request.tag(TelemetryOptions.class) == null)
-			request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-		request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
-
-		Response response = null;
-		int requestsCount = 1;
-
-		// Use should retry pass along with this request
-		RedirectOptions redirectOptions = request.tag(RedirectOptions.class);
-		redirectOptions = redirectOptions != null ? redirectOptions : this.mRedirectOptions;
-
-		while(true) {
-			response = chain.proceed(request);
-			boolean shouldRedirect = isRedirected(request, response, requestsCount, redirectOptions)
-					&& redirectOptions.shouldRedirect().shouldRedirect(response);
-			if(!shouldRedirect) break;
-
-			Request followup = getRedirect(request, response);
-			if(followup == null) break;
-			request = followup;
-
-			requestsCount++;
-		}
-		return response;
-	}
+    @Override
+    @Nullable
+    public Response intercept(@Nonnull final Chain chain) throws IOException {
+        Request request = chain.request();
+
+        if(request.tag(TelemetryOptions.class) == null)
+            request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
+        request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
+
+        Response response = null;
+        int requestsCount = 1;
+
+        // Use should retry pass along with this request
+        RedirectOptions redirectOptions = request.tag(RedirectOptions.class);
+        redirectOptions = redirectOptions != null ? redirectOptions : this.mRedirectOptions;
+
+        while(true) {
+            response = chain.proceed(request);
+            boolean shouldRedirect = isRedirected(request, response, requestsCount, redirectOptions)
+                    && redirectOptions.shouldRedirect().shouldRedirect(response);
+            if(!shouldRedirect) break;
+
+            Request followup = getRedirect(request, response);
+            if(followup == null) break;
+            request = followup;
+
+            requestsCount++;
+        }
+        return response;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index 361f7a6cb..6a1e88362 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -22,7 +22,7 @@ public class RetryHandler implements Interceptor{
     /**
      * Type of the current middleware
      */
-	public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.RETRY;
+    public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.RETRY;
 
     private RetryOptions mRetryOption;
 
@@ -75,7 +75,7 @@ public class RetryHandler implements Interceptor{
     public RetryHandler(@Nullable final RetryOptions retryOption) {
         this.mRetryOption = retryOption;
         if(this.mRetryOption == null) {
-        	this.mRetryOption = new RetryOptions();
+            this.mRetryOption = new RetryOptions();
         }
     }
     /**
@@ -85,111 +85,111 @@ public RetryHandler() {
         this(null);
     }
 
-	boolean retryRequest(Response response, int executionCount, Request request, RetryOptions retryOptions) {
-
-		// Should retry option
-		// Use should retry common for all requests
-		IShouldRetry shouldRetryCallback = null;
-		if(retryOptions != null) {
-			shouldRetryCallback = retryOptions.shouldRetry();
-		}
-
-		boolean shouldRetry = false;
-		// Status codes 429 503 504
-		int statusCode = response.code();
-		// Only requests with payloads that are buffered/rewindable are supported.
-		// Payloads with forward only streams will be have the responses returned
-		// without any retry attempt.
-		shouldRetry =
-				(executionCount <= retryOptions.maxRetries())
-				&& checkStatus(statusCode) && isBuffered(response, request)
-				&& shouldRetryCallback != null
-				&& shouldRetryCallback.shouldRetry(retryOptions.delay(), executionCount, request, response);
-
-		if(shouldRetry) {
-			long retryInterval = getRetryAfter(response, retryOptions.delay(), executionCount);
-			try {
-				Thread.sleep(retryInterval);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		return shouldRetry;
-	}
-
-	/**
-	 * Get retry after in milliseconds
-	 * @param response Response
-	 * @param delay Delay in seconds
-	 * @param executionCount Execution count of retries
-	 * @return Retry interval in milliseconds
-	 */
-	long getRetryAfter(Response response, long delay, int executionCount) {
-		String retryAfterHeader = response.header(RETRY_AFTER);
-		double retryDelay = RetryOptions.DEFAULT_DELAY * DELAY_MILLISECONDS;
-		if(retryAfterHeader != null) {
-			retryDelay = Long.parseLong(retryAfterHeader) * DELAY_MILLISECONDS;
-		} else {
-			retryDelay = (double)((Math.pow(2.0, (double)executionCount)-1)*0.5);
-			retryDelay = (executionCount < 2 ? delay : retryDelay + delay) + (double)Math.random();
-			retryDelay *= DELAY_MILLISECONDS;
-		}
-		return (long)Math.min(retryDelay, RetryOptions.MAX_DELAY * DELAY_MILLISECONDS);
-	}
-
-	boolean checkStatus(int statusCode) {
-	    return (statusCode == MSClientErrorCodeTooManyRequests || statusCode == MSClientErrorCodeServiceUnavailable
-	    		|| statusCode == MSClientErrorCodeGatewayTimeout);
-	}
-
-	boolean isBuffered(Response response, Request request) {
-		String methodName = request.method();
-		if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE") || methodName.equalsIgnoreCase("HEAD") || methodName.equalsIgnoreCase("OPTIONS"))
-			return true;
-
-		boolean isHTTPMethodPutPatchOrPost = methodName.equalsIgnoreCase("POST") ||
-				methodName.equalsIgnoreCase("PUT") ||
-				methodName.equalsIgnoreCase("PATCH");
-
-		if(isHTTPMethodPutPatchOrPost) {
-			boolean isStream = response.header(CONTENT_TYPE)!=null && response.header(CONTENT_TYPE).equalsIgnoreCase(APPLICATION_OCTET_STREAM);
-			if(!isStream) {
-				String transferEncoding = response.header(TRANSFER_ENCODING);
-				boolean isTransferEncodingChunked = (transferEncoding != null) &&
-						transferEncoding.equalsIgnoreCase(TRANSFER_ENCODING_CHUNKED);
-
-				if(request.body() != null && isTransferEncodingChunked)
-					return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	@Nullable
-	public Response intercept(@Nonnull final Chain chain) throws IOException {
-		Request request = chain.request();
-
-		if(request.tag(TelemetryOptions.class) == null)
-			request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-		request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
-
-		Response response = chain.proceed(request);
-
-		// Use should retry pass along with this request
-		RetryOptions retryOption = request.tag(RetryOptions.class);
-		retryOption = retryOption != null ? retryOption : mRetryOption;
-
-		int executionCount = 1;
-		while(retryRequest(response, executionCount, request, retryOption)) {
-			request = request.newBuilder().addHeader(RETRY_ATTEMPT_HEADER, String.valueOf(executionCount)).build();
-			executionCount++;
-			if(response != null && response.body() != null) {
-				response.body().close();
-			}
-			response = chain.proceed(request);
-		}
-		return response;
-	}
+    boolean retryRequest(Response response, int executionCount, Request request, RetryOptions retryOptions) {
+
+        // Should retry option
+        // Use should retry common for all requests
+        IShouldRetry shouldRetryCallback = null;
+        if(retryOptions != null) {
+            shouldRetryCallback = retryOptions.shouldRetry();
+        }
+
+        boolean shouldRetry = false;
+        // Status codes 429 503 504
+        int statusCode = response.code();
+        // Only requests with payloads that are buffered/rewindable are supported.
+        // Payloads with forward only streams will be have the responses returned
+        // without any retry attempt.
+        shouldRetry =
+                (executionCount <= retryOptions.maxRetries())
+                && checkStatus(statusCode) && isBuffered(response, request)
+                && shouldRetryCallback != null
+                && shouldRetryCallback.shouldRetry(retryOptions.delay(), executionCount, request, response);
+
+        if(shouldRetry) {
+            long retryInterval = getRetryAfter(response, retryOptions.delay(), executionCount);
+            try {
+                Thread.sleep(retryInterval);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        return shouldRetry;
+    }
+
+    /**
+     * Get retry after in milliseconds
+     * @param response Response
+     * @param delay Delay in seconds
+     * @param executionCount Execution count of retries
+     * @return Retry interval in milliseconds
+     */
+    long getRetryAfter(Response response, long delay, int executionCount) {
+        String retryAfterHeader = response.header(RETRY_AFTER);
+        double retryDelay = RetryOptions.DEFAULT_DELAY * DELAY_MILLISECONDS;
+        if(retryAfterHeader != null) {
+            retryDelay = Long.parseLong(retryAfterHeader) * DELAY_MILLISECONDS;
+        } else {
+            retryDelay = (double)((Math.pow(2.0, (double)executionCount)-1)*0.5);
+            retryDelay = (executionCount < 2 ? delay : retryDelay + delay) + (double)Math.random();
+            retryDelay *= DELAY_MILLISECONDS;
+        }
+        return (long)Math.min(retryDelay, RetryOptions.MAX_DELAY * DELAY_MILLISECONDS);
+    }
+
+    boolean checkStatus(int statusCode) {
+        return (statusCode == MSClientErrorCodeTooManyRequests || statusCode == MSClientErrorCodeServiceUnavailable
+                || statusCode == MSClientErrorCodeGatewayTimeout);
+    }
+
+    boolean isBuffered(Response response, Request request) {
+        String methodName = request.method();
+        if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE") || methodName.equalsIgnoreCase("HEAD") || methodName.equalsIgnoreCase("OPTIONS"))
+            return true;
+
+        boolean isHTTPMethodPutPatchOrPost = methodName.equalsIgnoreCase("POST") ||
+                methodName.equalsIgnoreCase("PUT") ||
+                methodName.equalsIgnoreCase("PATCH");
+
+        if(isHTTPMethodPutPatchOrPost) {
+            boolean isStream = response.header(CONTENT_TYPE)!=null && response.header(CONTENT_TYPE).equalsIgnoreCase(APPLICATION_OCTET_STREAM);
+            if(!isStream) {
+                String transferEncoding = response.header(TRANSFER_ENCODING);
+                boolean isTransferEncodingChunked = (transferEncoding != null) &&
+                        transferEncoding.equalsIgnoreCase(TRANSFER_ENCODING_CHUNKED);
+
+                if(request.body() != null && isTransferEncodingChunked)
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    @Nullable
+    public Response intercept(@Nonnull final Chain chain) throws IOException {
+        Request request = chain.request();
+
+        if(request.tag(TelemetryOptions.class) == null)
+            request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
+        request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
+
+        Response response = chain.proceed(request);
+
+        // Use should retry pass along with this request
+        RetryOptions retryOption = request.tag(RetryOptions.class);
+        retryOption = retryOption != null ? retryOption : mRetryOption;
+
+        int executionCount = 1;
+        while(retryRequest(response, executionCount, request, retryOption)) {
+            request = request.newBuilder().addHeader(RETRY_ATTEMPT_HEADER, String.valueOf(executionCount)).build();
+            executionCount++;
+            if(response != null && response.body() != null) {
+                response.body().close();
+            }
+            response = chain.proceed(request);
+        }
+        return response;
+    }
 
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
index c86820737..a8da98107 100644
--- a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -43,9 +43,9 @@ public class TelemetryHandler implements Interceptor{
      */
     public static final String CLIENT_REQUEST_ID = "client-request-id";
 
-	@Override
-	@Nullable
-	public Response intercept(@Nonnull final Chain chain) throws IOException {
+    @Override
+    @Nullable
+    public Response intercept(@Nonnull final Chain chain) throws IOException {
         final Request request = chain.request();
         final Request.Builder telemetryAddedBuilder = request.newBuilder();
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
index e9683e883..a79451398 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRedirect.java
@@ -13,5 +13,5 @@ public interface IShouldRedirect {
      * @param response current response
      * @return whether the handler should follow the redirect information
      */
-	boolean shouldRedirect(@Nonnull final Response response);
+    boolean shouldRedirect(@Nonnull final Response response);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
index e12fecd24..ca2b73ede 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/IShouldRetry.java
@@ -17,5 +17,5 @@ public interface IShouldRetry {
      * @param response current response
      * @return whether the specific request should be retried by the handler
      */
-	boolean shouldRetry(long delay, int executionCount, @Nonnull final Request request, @Nonnull final Response response);
+    boolean shouldRetry(long delay, int executionCount, @Nonnull final Request request, @Nonnull final Response response);
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java
index f5e402da0..3c05d3dd1 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/MiddlewareType.java
@@ -5,23 +5,23 @@
  */
 public enum MiddlewareType {
 
-	/**
+    /**
      * Authentication Middleware
      */
-	AUTHENTICATION,
+    AUTHENTICATION,
 
-	/**
+    /**
      * Redirect Middleware
      */
-	REDIRECT,
+    REDIRECT,
 
-	/**
+    /**
      * Retry Middleware
      */
-	RETRY,
+    RETRY,
 
-	/**
+    /**
      * Not supported
      */
-	NOT_SUPPORTED
+    NOT_SUPPORTED
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
index 510437e93..72c944db1 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RedirectOptions.java
@@ -17,52 +17,52 @@ public class RedirectOptions implements IMiddlewareControl{
     /**
      * The absolute maxium number of redirects that can be followed
      */
-	public static final int MAX_REDIRECTS = 20;
+    public static final int MAX_REDIRECTS = 20;
 
     private IShouldRedirect shouldRedirect;
     /**
      * Default redirect evaluation, always follow redirect information.
      */
-	public static final IShouldRedirect DEFAULT_SHOULD_REDIRECT = new IShouldRedirect() {
-		@Override
-		public boolean shouldRedirect(Response response) {
-			return true;
-		}
-	};
+    public static final IShouldRedirect DEFAULT_SHOULD_REDIRECT = new IShouldRedirect() {
+        @Override
+        public boolean shouldRedirect(Response response) {
+            return true;
+        }
+    };
 
-	/**
-	 * Create default instance of redirect options, with default values of max redirects and should redirect
-	 */
-	public RedirectOptions() {
-		this(DEFAULT_MAX_REDIRECTS, DEFAULT_SHOULD_REDIRECT);
-	}
+    /**
+     * Create default instance of redirect options, with default values of max redirects and should redirect
+     */
+    public RedirectOptions() {
+        this(DEFAULT_MAX_REDIRECTS, DEFAULT_SHOULD_REDIRECT);
+    }
 
-	/**
-	 * @param maxRedirects Max redirects to occur
-	 * @param shouldRedirect Should redirect callback called before every redirect
-	 */
-	public RedirectOptions(int maxRedirects, @Nullable final IShouldRedirect shouldRedirect) {
-		if(maxRedirects < 0)
-			throw new IllegalArgumentException("Max redirects cannot be negative");
-		if(maxRedirects > MAX_REDIRECTS)
-			throw new IllegalArgumentException("Max redirect cannot exceed " + MAX_REDIRECTS);
+    /**
+     * @param maxRedirects Max redirects to occur
+     * @param shouldRedirect Should redirect callback called before every redirect
+     */
+    public RedirectOptions(int maxRedirects, @Nullable final IShouldRedirect shouldRedirect) {
+        if(maxRedirects < 0)
+            throw new IllegalArgumentException("Max redirects cannot be negative");
+        if(maxRedirects > MAX_REDIRECTS)
+            throw new IllegalArgumentException("Max redirect cannot exceed " + MAX_REDIRECTS);
 
-		this.maxRedirects = maxRedirects;
-		this.shouldRedirect = shouldRedirect != null ? shouldRedirect : DEFAULT_SHOULD_REDIRECT;
-	}
+        this.maxRedirects = maxRedirects;
+        this.shouldRedirect = shouldRedirect != null ? shouldRedirect : DEFAULT_SHOULD_REDIRECT;
+    }
 
-	/**
-	 * @return max redirects
-	 */
-	public int maxRedirects() {
-		return this.maxRedirects;
-	}
+    /**
+     * @return max redirects
+     */
+    public int maxRedirects() {
+        return this.maxRedirects;
+    }
 
-	/**
-	 * @return should redirect
-	 */
-	@Nonnull
-	public IShouldRedirect shouldRedirect() {
-		return this.shouldRedirect;
-	}
+    /**
+     * @return should redirect
+     */
+    @Nonnull
+    public IShouldRedirect shouldRedirect() {
+        return this.shouldRedirect;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
index d365dc1ab..8fa390a48 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/RetryOptions.java
@@ -14,12 +14,12 @@ public class RetryOptions implements IMiddlewareControl {
     /**
      * Default retry evaluation, always retry.
      */
-	public static final IShouldRetry DEFAULT_SHOULD_RETRY = new IShouldRetry() {
-		@Override
-		public boolean shouldRetry(long delay, int executionCount, Request request, Response response) {
-			return true;
-		}
-	};
+    public static final IShouldRetry DEFAULT_SHOULD_RETRY = new IShouldRetry() {
+        @Override
+        public boolean shouldRetry(long delay, int executionCount, Request request, Response response) {
+            return true;
+        }
+    };
 
     private int mMaxRetries;
     /**
@@ -47,51 +47,51 @@ public boolean shouldRetry(long delay, int executionCount, Request request, Resp
     /**
      * Create default instance of retry options, with default values of delay, max retries and shouldRetry callback.
      */
-	public RetryOptions(){
-		this(DEFAULT_SHOULD_RETRY, DEFAULT_MAX_RETRIES, DEFAULT_DELAY);
-	}
+    public RetryOptions(){
+        this(DEFAULT_SHOULD_RETRY, DEFAULT_MAX_RETRIES, DEFAULT_DELAY);
+    }
 
-	/**
+    /**
      * Create an instance with provided values
-	 * @param shouldRetry Retry callback to be called before making a retry
-	 * @param maxRetries Number of max retires for a request
-	 * @param delay Delay in seconds between retries
-	 */
-	@SuppressWarnings("LambdaLast")
-	public RetryOptions(@Nullable final IShouldRetry shouldRetry, int maxRetries, long delay) {
-		if(delay > MAX_DELAY)
-			throw new IllegalArgumentException("Delay cannot exceed " + MAX_DELAY);
-		if(delay < 0)
-			throw new IllegalArgumentException("Delay cannot be negative");
-		if(maxRetries > MAX_RETRIES)
-			throw new IllegalArgumentException("Max retries cannot exceed " + MAX_RETRIES);
-		if(maxRetries < 0)
-			throw new IllegalArgumentException("Max retries cannot be negative");
+     * @param shouldRetry Retry callback to be called before making a retry
+     * @param maxRetries Number of max retires for a request
+     * @param delay Delay in seconds between retries
+     */
+    @SuppressWarnings("LambdaLast")
+    public RetryOptions(@Nullable final IShouldRetry shouldRetry, int maxRetries, long delay) {
+        if(delay > MAX_DELAY)
+            throw new IllegalArgumentException("Delay cannot exceed " + MAX_DELAY);
+        if(delay < 0)
+            throw new IllegalArgumentException("Delay cannot be negative");
+        if(maxRetries > MAX_RETRIES)
+            throw new IllegalArgumentException("Max retries cannot exceed " + MAX_RETRIES);
+        if(maxRetries < 0)
+            throw new IllegalArgumentException("Max retries cannot be negative");
 
-		this.mShouldretry = shouldRetry != null ? shouldRetry : DEFAULT_SHOULD_RETRY;
-		this.mMaxRetries = maxRetries;
-		this.mDelay = delay;
-	}
+        this.mShouldretry = shouldRetry != null ? shouldRetry : DEFAULT_SHOULD_RETRY;
+        this.mMaxRetries = maxRetries;
+        this.mDelay = delay;
+    }
 
-	/**
-	 * @return should retry callback
-	 */
-	@Nonnull
-	public IShouldRetry shouldRetry() {
-		return mShouldretry;
-	}
+    /**
+     * @return should retry callback
+     */
+    @Nonnull
+    public IShouldRetry shouldRetry() {
+        return mShouldretry;
+    }
 
-	/**
-	 * @return Number of max retries
-	 */
-	public int maxRetries() {
-		return mMaxRetries;
-	}
+    /**
+     * @return Number of max retries
+     */
+    public int maxRetries() {
+        return mMaxRetries;
+    }
 
-	/**
-	 * @return Delay in seconds between retries
-	 */
-	public long delay() {
-		return mDelay;
-	}
+    /**
+     * @return Delay in seconds between retries
+     */
+    public long delay() {
+        return mDelay;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
index 24348f2eb..ecdf6ae01 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
@@ -32,53 +32,53 @@ public class TelemetryOptions {
     /**
      * Logging handler enabled
      */
-	public static final int LOGGING_HANDLER_ENABLED_FLAG = 16;
+    public static final int LOGGING_HANDLER_ENABLED_FLAG = 16;
 
-	private int featureUsage = NONE_FLAG;
-	private String clientRequestId;
+    private int featureUsage = NONE_FLAG;
+    private String clientRequestId;
 
     /**
      * Sets a numeric representation of the SDK feature usage
      * @param flag a numeric representation of the SDK feature usage
      */
-	public void setFeatureUsage(int flag) {
-		featureUsage = featureUsage | flag;
-	}
+    public void setFeatureUsage(int flag) {
+        featureUsage = featureUsage | flag;
+    }
 
     /**
      * Gets a numeric representation of the SDK feature usage
      * @return a numeric representation of the SDK feature usage
      */
-	public int getFeatureUsage() {
-		return featureUsage;
-	}
+    public int getFeatureUsage() {
+        return featureUsage;
+    }
 
     /**
      * Gets a serialized representation of the SDK feature usage.
      * @return a serialized representation of the SDK feature usage
      */
-	@Nonnull
-	public String getSerializedFeatureUsage() {
-		return Integer.toHexString(featureUsage);
-	}
+    @Nonnull
+    public String getSerializedFeatureUsage() {
+        return Integer.toHexString(featureUsage);
+    }
 
     /**
      * Sets the client request id
      * @param clientRequestId the client request id to set, preferably the string representation of a GUID
      */
-	public void setClientRequestId(@Nonnull final String clientRequestId) {
-		this.clientRequestId = clientRequestId;
-	}
+    public void setClientRequestId(@Nonnull final String clientRequestId) {
+        this.clientRequestId = clientRequestId;
+    }
     /**
      * Gets the client request id
      * @return the client request id
      */
-	@Nonnull
-	public String getClientRequestId() {
-		if(clientRequestId == null) {
-			clientRequestId = UUID.randomUUID().toString();
-		}
-		return clientRequestId;
-	}
+    @Nonnull
+    public String getClientRequestId() {
+        if(clientRequestId == null) {
+            clientRequestId = UUID.randomUUID().toString();
+        }
+        return clientRequestId;
+    }
 
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
index 924dc6c68..3c1a0c777 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
@@ -11,78 +11,78 @@
 
 public class MSBatchRequestContentTest {
 
-	String testurl = "http://graph.microsoft.com/me";
+    String testurl = "http://graph.microsoft.com/me";
 
-	@Test
-	public void testMSBatchRequestContentCreation() {
-		List<MSBatchRequestStep> requestStepArray = new ArrayList<>();
-		for(int i=0;i<5;i++) {
-			Request request = new Request.Builder().url(testurl).build();
-			List<String> arrayOfDependsOnIds = new ArrayList<>();
-			MSBatchRequestStep requestStep = new MSBatchRequestStep("" + i, request, arrayOfDependsOnIds);
-			requestStepArray.add(requestStep);
-		}
-		MSBatchRequestContent requestContent = new MSBatchRequestContent(requestStepArray);
-		assertTrue(requestContent.getBatchRequestContent() != null);
-	}
+    @Test
+    public void testMSBatchRequestContentCreation() {
+        List<MSBatchRequestStep> requestStepArray = new ArrayList<>();
+        for(int i=0;i<5;i++) {
+            Request request = new Request.Builder().url(testurl).build();
+            List<String> arrayOfDependsOnIds = new ArrayList<>();
+            MSBatchRequestStep requestStep = new MSBatchRequestStep("" + i, request, arrayOfDependsOnIds);
+            requestStepArray.add(requestStep);
+        }
+        MSBatchRequestContent requestContent = new MSBatchRequestContent(requestStepArray);
+        assertTrue(requestContent.getBatchRequestContent() != null);
+    }
 
-	@Test
-	public void testGetBatchRequestContent() {
-		Request request = new Request.Builder().url(testurl).build();
-		List<String> arrayOfDependsOnIds = new ArrayList<>();
-		MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
-		MSBatchRequestContent requestContent = new MSBatchRequestContent();
-		requestContent.addBatchRequestStep(requestStep);
-		String content = requestContent.getBatchRequestContent();
-		String expectedContent = "{\"requests\":[{\"id\":\"1\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"dependsOn\":[]}]}";
-		assertTrue(content.compareTo(expectedContent) == 0);
-	}
+    @Test
+    public void testGetBatchRequestContent() {
+        Request request = new Request.Builder().url(testurl).build();
+        List<String> arrayOfDependsOnIds = new ArrayList<>();
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestContent requestContent = new MSBatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        String content = requestContent.getBatchRequestContent();
+        String expectedContent = "{\"requests\":[{\"id\":\"1\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"dependsOn\":[]}]}";
+        assertTrue(content.compareTo(expectedContent) == 0);
+    }
 
-	@Test
-	public void testGetBatchRequestContentWithHeader() {
-		Request request = new Request.Builder().url(testurl).header("testkey", "testvalue").build();
-		List<String> arrayOfDependsOnIds = new ArrayList<>();
-		MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
-		MSBatchRequestContent requestContent = new MSBatchRequestContent();
-		requestContent.addBatchRequestStep(requestStep);
-		String content = requestContent.getBatchRequestContent();
-		System.out.println(content);
-		String expectedContent = "{\"requests\":[{\"id\":\"1\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"headers\":{\"testkey\":\"testvalue\"},\"dependsOn\":[]}]}";
-		assertTrue(content.compareTo(expectedContent) == 0);
-	}
+    @Test
+    public void testGetBatchRequestContentWithHeader() {
+        Request request = new Request.Builder().url(testurl).header("testkey", "testvalue").build();
+        List<String> arrayOfDependsOnIds = new ArrayList<>();
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestContent requestContent = new MSBatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        String content = requestContent.getBatchRequestContent();
+        System.out.println(content);
+        String expectedContent = "{\"requests\":[{\"id\":\"1\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"headers\":{\"testkey\":\"testvalue\"},\"dependsOn\":[]}]}";
+        assertTrue(content.compareTo(expectedContent) == 0);
+    }
 
-	@Test
-	public void testRemoveBatchRequesStepWithId() {
-		Request request = new Request.Builder().url(testurl).build();
-		List<String> arrayOfDependsOnIds = new ArrayList<>();
-		MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
-		MSBatchRequestContent requestContent = new MSBatchRequestContent();
-		requestContent.addBatchRequestStep(requestStep);
-		requestContent.removeBatchRequestStepWithId("1");
-		String content = requestContent.getBatchRequestContent();
-		String expectedContent = "{\"requests\":[]}";
-		assertTrue(content.compareTo(expectedContent) == 0);
-	}
+    @Test
+    public void testRemoveBatchRequesStepWithId() {
+        Request request = new Request.Builder().url(testurl).build();
+        List<String> arrayOfDependsOnIds = new ArrayList<>();
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestContent requestContent = new MSBatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        requestContent.removeBatchRequestStepWithId("1");
+        String content = requestContent.getBatchRequestContent();
+        String expectedContent = "{\"requests\":[]}";
+        assertTrue(content.compareTo(expectedContent) == 0);
+    }
 
-	@Test
-	public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() {
-		Request request = new Request.Builder().url(testurl).build();
-		List<String> arrayOfDependsOnIds = new ArrayList<>();
-		MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+    @Test
+    public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() {
+        Request request = new Request.Builder().url(testurl).build();
+        List<String> arrayOfDependsOnIds = new ArrayList<>();
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
 
-		Request request1 = new Request.Builder().url(testurl).build();
-		List<String> arrayOfDependsOnIds1 = new ArrayList<>();
-		arrayOfDependsOnIds1.add("1");
-		MSBatchRequestStep requestStep1 = new MSBatchRequestStep("2", request1, arrayOfDependsOnIds1);
+        Request request1 = new Request.Builder().url(testurl).build();
+        List<String> arrayOfDependsOnIds1 = new ArrayList<>();
+        arrayOfDependsOnIds1.add("1");
+        MSBatchRequestStep requestStep1 = new MSBatchRequestStep("2", request1, arrayOfDependsOnIds1);
 
-		MSBatchRequestContent requestContent = new MSBatchRequestContent();
-		requestContent.addBatchRequestStep(requestStep);
-		requestContent.addBatchRequestStep(requestStep1);
+        MSBatchRequestContent requestContent = new MSBatchRequestContent();
+        requestContent.addBatchRequestStep(requestStep);
+        requestContent.addBatchRequestStep(requestStep1);
 
-		requestContent.removeBatchRequestStepWithId("1");
-		String content = requestContent.getBatchRequestContent();
-		String expectedContent = "{\"requests\":[{\"id\":\"2\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"dependsOn\":[]}]}";
-		assertTrue(content.compareTo(expectedContent) == 0);
-	}
+        requestContent.removeBatchRequestStepWithId("1");
+        String content = requestContent.getBatchRequestContent();
+        String expectedContent = "{\"requests\":[{\"id\":\"2\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"dependsOn\":[]}]}";
+        assertTrue(content.compareTo(expectedContent) == 0);
+    }
 
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
index d17af87a2..3bf3ca660 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
@@ -11,15 +11,15 @@
 
 public class MSBatchRequestStepTest {
 
-	@Test
-	public void testMSBatchRequestStepCreation() {
-		Request request = new Request.Builder().url("http://graph.microsoft.com").build();
-		List<String> arrayOfDependsOnIds = new ArrayList<>();
-		MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
-		assertTrue("Test BatchRequestStep creation", requestStep != null);
-		assertTrue("Test Request id", requestStep.getRequestId().compareTo("1") == 0);
-		assertTrue("Test Request object", requestStep.getRequest() == request);
-		assertTrue("Test Array of depends on Ids", requestStep.getArrayOfDependsOnIds() != null);
-	}
+    @Test
+    public void testMSBatchRequestStepCreation() {
+        Request request = new Request.Builder().url("http://graph.microsoft.com").build();
+        List<String> arrayOfDependsOnIds = new ArrayList<>();
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        assertTrue("Test BatchRequestStep creation", requestStep != null);
+        assertTrue("Test Request id", requestStep.getRequestId().compareTo("1") == 0);
+        assertTrue("Test Request object", requestStep.getRequest() == request);
+        assertTrue("Test Array of depends on Ids", requestStep.getArrayOfDependsOnIds() != null);
+    }
 
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
index 56095531e..14427d814 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
@@ -17,110 +17,110 @@
 import okhttp3.ResponseBody;
 
 public class MSBatchResponseContentTest {
-	
-	@Test
-	public void testNullMSBatchResponseContent() {
-		Response response = null;
-		try {
-			new MSBatchResponseContent(response);
-		}
-		catch(IllegalArgumentException e) {
-			assertNotNull(e);
-		}
-	}
-	
-	@Test
-	public void testValidMSBatchResponseContent() {
-		String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-		String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-		Response responsedata = TestResponse(responsebody, requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-		assertTrue(batchresponse.getResponses() != null);
-	}
-	
-	@Test
-	public void testInvalidMSBatchResponseContentWithEmptyResponse() {
-		String responsebody = "{\"responses\": [] }";
-		String requestbody = "{\"requests\":[]}";
-		Response responsedata = TestResponse(responsebody, requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-		assertTrue(batchresponse.getResponseById("1") == null);
-	}
-	
-	@Test
-	public void testInvalidMSBatchResponseContentWithNullResponseString() {
-		try{
-			new MSBatchResponseContent(null);
-		}catch(Exception e) {
-			assertTrue(e instanceof IllegalArgumentException);
-		}
-	}
-	
-	@Test
-	public void testInvalidMSBatchResponseContentWithMalformedResponse() {
-		String invalidResponsebody = "{responses: [] }";
-		String requestbody = "{requests:[]}";
-		Response invalidResponsedata = TestResponse(invalidResponsebody, requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(invalidResponsedata);
-		assertTrue(batchresponse.getResponses().keySet().isEmpty());
-	}
-	
-	@Test
-	public void testGetMSBatchResponseContentByID() throws IOException {
-		String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-		String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-		Response responsedata = TestResponse(responsebody,requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-		Response response = batchresponse.getResponseById("1");
-		assertTrue(response != null);
-	}
-	
-	@Test
-	public void testGetMSBatchResponseContentIteratorOverResponse() throws IOException {
-		String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-		String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-		Response responsedata = TestResponse(responsebody,requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-		Iterator<Map.Entry<String, Response>> it = batchresponse.getResponsesIterator();
-		while(it.hasNext()) {
-			Map.Entry<String, Response> entry = it.next();
-			assertTrue(entry.getKey()!=null && entry.getValue()!=null);
-		}
-	}
-	
-	@Test
-	public void testGetMSBatchResponseContentMapResponse() throws IOException {
-		String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-		String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-		Response responsedata = TestResponse(responsebody,requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-		for(Map.Entry<String, Response> entry: batchresponse.getResponses().entrySet()) {
-			assertTrue(entry.getKey() != null && entry.getValue() != null);
-		}
-	}
-	
-	@Test
-	public void testGetMSBatchResponseContentUpdate() throws IOException {
-		String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-		String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-		Response responsedata = TestResponse(responsebody,requestbody);
-		MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-		assertTrue(batchresponse.getResponses().size() == 3);
-		String responsebody2 = "{\"responses\": [{\"id\": \"4\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"5\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"6\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-		String requestbody2 = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"4\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"5\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"6\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-		Response responsedata2 = TestResponse(responsebody2,requestbody2);
-		batchresponse.update(responsedata2);
-		assertTrue(batchresponse.getResponses().size() == 6);
-	}
-	
-	private Response TestResponse(String responsebody, String requestbody) {
-		Response.Builder builder = new Response.Builder();
-		builder.body(ResponseBody.create(MediaType.parse("application/json"), responsebody));
-		Request request = new Request.Builder().url("https://graph.microsoft.com/").method("POST", RequestBody.create(MediaType.parse("application/json"), requestbody)).build();
-		builder.request(request);
-		builder.protocol(Protocol.HTTP_1_0);
-		builder.code(200);
-		builder.message("test message");
-		return builder.build();
-	}
+
+    @Test
+    public void testNullMSBatchResponseContent() {
+        Response response = null;
+        try {
+            new MSBatchResponseContent(response);
+        }
+        catch(IllegalArgumentException e) {
+            assertNotNull(e);
+        }
+    }
+
+    @Test
+    public void testValidMSBatchResponseContent() {
+        String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
+        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
+        Response responsedata = TestResponse(responsebody, requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        assertTrue(batchresponse.getResponses() != null);
+    }
+
+    @Test
+    public void testInvalidMSBatchResponseContentWithEmptyResponse() {
+        String responsebody = "{\"responses\": [] }";
+        String requestbody = "{\"requests\":[]}";
+        Response responsedata = TestResponse(responsebody, requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        assertTrue(batchresponse.getResponseById("1") == null);
+    }
+
+    @Test
+    public void testInvalidMSBatchResponseContentWithNullResponseString() {
+        try{
+            new MSBatchResponseContent(null);
+        }catch(Exception e) {
+            assertTrue(e instanceof IllegalArgumentException);
+        }
+    }
+
+    @Test
+    public void testInvalidMSBatchResponseContentWithMalformedResponse() {
+        String invalidResponsebody = "{responses: [] }";
+        String requestbody = "{requests:[]}";
+        Response invalidResponsedata = TestResponse(invalidResponsebody, requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(invalidResponsedata);
+        assertTrue(batchresponse.getResponses().keySet().isEmpty());
+    }
+
+    @Test
+    public void testGetMSBatchResponseContentByID() throws IOException {
+        String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
+        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
+        Response responsedata = TestResponse(responsebody,requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        Response response = batchresponse.getResponseById("1");
+        assertTrue(response != null);
+    }
+
+    @Test
+    public void testGetMSBatchResponseContentIteratorOverResponse() throws IOException {
+        String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
+        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
+        Response responsedata = TestResponse(responsebody,requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        Iterator<Map.Entry<String, Response>> it = batchresponse.getResponsesIterator();
+        while(it.hasNext()) {
+            Map.Entry<String, Response> entry = it.next();
+            assertTrue(entry.getKey()!=null && entry.getValue()!=null);
+        }
+    }
+
+    @Test
+    public void testGetMSBatchResponseContentMapResponse() throws IOException {
+        String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
+        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
+        Response responsedata = TestResponse(responsebody,requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        for(Map.Entry<String, Response> entry: batchresponse.getResponses().entrySet()) {
+            assertTrue(entry.getKey() != null && entry.getValue() != null);
+        }
+    }
+
+    @Test
+    public void testGetMSBatchResponseContentUpdate() throws IOException {
+        String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
+        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
+        Response responsedata = TestResponse(responsebody,requestbody);
+        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        assertTrue(batchresponse.getResponses().size() == 3);
+        String responsebody2 = "{\"responses\": [{\"id\": \"4\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"5\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"6\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
+        String requestbody2 = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"4\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"5\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"6\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
+        Response responsedata2 = TestResponse(responsebody2,requestbody2);
+        batchresponse.update(responsedata2);
+        assertTrue(batchresponse.getResponses().size() == 6);
+    }
+
+    private Response TestResponse(String responsebody, String requestbody) {
+        Response.Builder builder = new Response.Builder();
+        builder.body(ResponseBody.create(MediaType.parse("application/json"), responsebody));
+        Request request = new Request.Builder().url("https://graph.microsoft.com/").method("POST", RequestBody.create(MediaType.parse("application/json"), requestbody)).build();
+        builder.request(request);
+        builder.protocol(Protocol.HTTP_1_0);
+        builder.code(200);
+        builder.message("test message");
+        return builder.build();
+    }
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index 601cb4427..e79175c5d 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -11,35 +11,35 @@
 
 @Ignore
 public class AuthenticationHandlerTest {
-	
-	static String token = "TEST-TOKEN";
-	
-	public static class AuthProvider implements ICoreAuthenticationProvider{
-		 public Request authenticateRequest(Request request) {
-			 Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + token).build();
-			 return newRequest;
-		 }
-	}
-
-	@Test
-	public void testAuthenticationHandler() {
-		AuthProvider authProvider = new AuthProvider();
-		AuthenticationHandler authHandler = new AuthenticationHandler(authProvider);
-		Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
-		
-		RealInterceptorChain chain = new RealInterceptorChain(null, null, 0, null, request, 0, 0, 0);
-		
-		try {
-			authHandler.intercept(chain);
-			
-			String value = request.header("Authorization");
-			assertTrue(value.equals("Bearer " + token));
-			
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Authentication handler failure");
-		}
-	}
+
+    static String token = "TEST-TOKEN";
+
+    public static class AuthProvider implements ICoreAuthenticationProvider{
+         public Request authenticateRequest(Request request) {
+             Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + token).build();
+             return newRequest;
+         }
+    }
+
+    @Test
+    public void testAuthenticationHandler() {
+        AuthProvider authProvider = new AuthProvider();
+        AuthenticationHandler authHandler = new AuthenticationHandler(authProvider);
+        Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
+
+        RealInterceptorChain chain = new RealInterceptorChain(null, null, 0, null, request, 0, 0, 0);
+
+        try {
+            authHandler.intercept(chain);
+
+            String value = request.header("Authorization");
+            assertTrue(value.equals("Bearer " + token));
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail("Authentication handler failure");
+        }
+    }
 
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
index 6043c432d..403801b34 100644
--- a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
@@ -10,30 +10,30 @@
 
 public class HttpClientsTest {
 
-	@Test
-	public void testHttpClientCreation() {
-		ICoreAuthenticationProvider authprovider = new ICoreAuthenticationProvider() {
-			public Request authenticateRequest(Request request) {
-				Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + "TOKEN").build();
-				return newRequest;
-			}
-		};
-		
-		OkHttpClient httpclient = HttpClients.createDefault(authprovider);
-		assertTrue(httpclient != null);
-	}
-	
-	@Test
-	public void arrayInterceptorsTest() {
-		AuthenticationHandler authenticationHandler = new AuthenticationHandler(new ICoreAuthenticationProvider() {
-			@Override
-			public Request authenticateRequest(Request request) {
-				return request;
-			}
-		});
-		Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
-		OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
-		assertTrue(client.interceptors().size()==4);
-	}
+    @Test
+    public void testHttpClientCreation() {
+        ICoreAuthenticationProvider authprovider = new ICoreAuthenticationProvider() {
+            public Request authenticateRequest(Request request) {
+                Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + "TOKEN").build();
+                return newRequest;
+            }
+        };
+
+        OkHttpClient httpclient = HttpClients.createDefault(authprovider);
+        assertTrue(httpclient != null);
+    }
+
+    @Test
+    public void arrayInterceptorsTest() {
+        AuthenticationHandler authenticationHandler = new AuthenticationHandler(new ICoreAuthenticationProvider() {
+            @Override
+            public Request authenticateRequest(Request request) {
+                return request;
+            }
+        });
+        Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
+        OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
+        assertTrue(client.interceptors().size()==4);
+    }
 
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
index 6eed2b7ad..ff50a30f5 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
@@ -19,248 +19,248 @@
 import okhttp3.internal.http.StatusLine;
 
 public class RedirectHandlerTest {
-	
-	String testmeurl = "https://graph.microsoft.com/v1.0/me/";
-	String testurl = "https://graph.microsoft.com/v1.0";
-	String differenthosturl = "https://graph.abc.com/v1.0/";
 
-	@Test
-	public void testIsRedirectedFailureByNoLocationHeader() throws IOException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_TEMP)
-				.message("Moved Temporarily")
-				.request(httpget)
-				.build();
-		boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
-		assertTrue(!isRedirected);
-	}
-	
-	@Test
-	public void testIsRedirectedFailureByStatusCodeBadRequest() throws IOException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_BAD_REQUEST)
-				.message( "Bad Request")
-				.addHeader("location", testmeurl)
-				.request(httpget)
-				.build();
-		boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
-		assertTrue(!isRedirected);
-	}
-	
-	@Test
-	public void testIsRedirectedSuccessWithStatusCodeMovedTemporarily() throws IOException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_TEMP)
-				.message("Moved Temporarily")
-				.addHeader("location", testmeurl)
-				.request(httpget)
-				.build();
-		boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
-		assertTrue(isRedirected);
-	}
-	
-	@Test
-	public void testIsRedirectedSuccessWithStatusCodeMovedPermanently() throws IOException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_PERM)
-				.message("Moved Permanently")
-				.addHeader("location", testmeurl)
-				.request(httpget)
-				.build();
-		boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
-		assertTrue(isRedirected);
-	}
+    String testmeurl = "https://graph.microsoft.com/v1.0/me/";
+    String testurl = "https://graph.microsoft.com/v1.0";
+    String differenthosturl = "https://graph.abc.com/v1.0/";
 
-	@Test
-	public void testIsRedirectedSuccessWithStatusCodeTemporaryRedirect() throws IOException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(StatusLine.HTTP_TEMP_REDIRECT)
-				.message("Temporary Redirect")
-				.addHeader("location", testmeurl)
-				.request(httpget)
-				.build();
-		boolean isRedirected = redirectHandler.isRedirected(httpget, response,0,new RedirectOptions());
-		assertTrue(isRedirected);
-	}
+    @Test
+    public void testIsRedirectedFailureByNoLocationHeader() throws IOException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_TEMP)
+                .message("Moved Temporarily")
+                .request(httpget)
+                .build();
+        boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
+        assertTrue(!isRedirected);
+    }
 
-	@Test
-	public void testIsRedirectedSuccessWithStatusCodeSeeOther() throws IOException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_SEE_OTHER)
-				.message( "See Other")
-				.addHeader("location", testmeurl)
-				.request(httpget)
-				.build();
-		boolean isRedirected = redirectHandler.isRedirected(httpget, response,0,new RedirectOptions());
-		assertTrue(isRedirected);
-	}
-	
-	@Test
-	public void testGetRedirectForGetMethod() {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_TEMP)
-				.message("Moved Temporarily")
-				.addHeader("location", testmeurl)
-				.request(httpget)
-				.build();
-		try {
-			Request request = redirectHandler.getRedirect(httpget, response);
-			assertTrue(request != null);
-			final String method = request.method();
-			assertTrue(method.equalsIgnoreCase("GET"));
-		} catch (ProtocolException e) {
-			e.printStackTrace();
-			fail("Redirect handler testGetRedirectForGetMethod failure");
-		}
-	}
-		
-	@Test
-	public void testGetRedirectForGetMethodForAuthHeader() {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httpget = new Request.Builder().url(testurl).header("Authorization", "TOKEN").build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_TEMP)
-				.message("Moved Temporarily")
-				.addHeader("location", differenthosturl)
-				.request(httpget)
-				.build();
-		
-		try {
-			Request request = redirectHandler.getRedirect(httpget, response);
-			assertTrue(request != null);
-			final String method = request.method();
-			assertTrue(method.equalsIgnoreCase("GET"));
-			String header = request.header("Authorization");
-			assertTrue(header == null);
-		} catch (ProtocolException e) {
-			e.printStackTrace();
-			fail("Redirect handler testGetRedirectForGetMethodForAuthHeader failure");
-		}
-	}
-	
-	@Test
-	public void testGetRedirectForHeadMethod() {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httphead = new Request.Builder().url(testurl).method("HEAD", null).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_TEMP)
-				.message("Moved Temporarily")
-				.addHeader("location", testmeurl)
-				.request(httphead)
-				.build();
-		try {
-			Request request = redirectHandler.getRedirect(httphead, response);
-			assertTrue(request != null);
-			final String method = request.method();
-			assertTrue(method.equalsIgnoreCase("HEAD"));
-		} catch (ProtocolException e) {
-			e.printStackTrace();
-			fail("Redirect handler testGetRedirectForHeadMethod failure");
-		}
-	}
-	
-	@Test
-	public void testGetRedirectForPostMethod() {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		RequestBody body = RequestBody.create(MediaType.parse("application/json"),"");
-		Request httppost = new Request.Builder().url(testurl).post(body).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_MOVED_TEMP)
-				.message("Moved Temporarily")
-				.addHeader("location", testmeurl)
-				.request(httppost)
-				.build();
-		try {
-			Request request = redirectHandler.getRedirect(httppost, response);
-			assertTrue(request != null);
-			final String method = request.method();
-			assertTrue(method.equalsIgnoreCase("POST"));
-		} catch (ProtocolException e) {
-			e.printStackTrace();
-			fail("Redirect handler testGetRedirectForPostMethod failure");
-		}
-	}
-	
-	@Test
-	public void testGetRedirectForPostMethodWithStatusCodeSeeOther() {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httppost = new Request.Builder().url(testurl).build();
-		
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_SEE_OTHER)
-				.message("See Other")
-				.addHeader("location", testmeurl)
-				.request(httppost)
-				.build();
-		
-		try {
-			Request request = redirectHandler.getRedirect(httppost, response);
-			assertTrue(request != null);
-			final String method = request.method();
-			assertTrue(method.equalsIgnoreCase("GET"));
-		} catch (ProtocolException e) {
-			e.printStackTrace();
-			fail("Redirect handler testGetRedirectForPostMethod1 failure");
-		}
-	}
-	
-	@Test
-	public void testGetRedirectForRelativeURL() throws ProtocolException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httppost = new Request.Builder().url(testurl).build();
-		
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_SEE_OTHER)
-				.message("See Other")
-				.addHeader("location", "/testrelativeurl")
-				.request(httppost)
-				.build();
-		
-			Request request = redirectHandler.getRedirect(httppost, response);
-			assertTrue(request.url().toString().compareTo(testurl+"/testrelativeurl") == 0);
-	}
-	
-	@Test
-	public void testGetRedirectRelativeLocationRequestURLwithSlash() throws ProtocolException {
-		RedirectHandler redirectHandler = new RedirectHandler();
-		Request httppost = new Request.Builder().url(testmeurl).build();
-		
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_SEE_OTHER)
-				.message("See Other")
-				.addHeader("location", "/testrelativeurl")
-				.request(httppost)
-				.build();
-			Request request = redirectHandler.getRedirect(httppost, response);
-			String expected = "https://graph.microsoft.com/v1.0/me/testrelativeurl";
-			assertTrue(request.url().toString().compareTo(expected) == 0);
-	}
+    @Test
+    public void testIsRedirectedFailureByStatusCodeBadRequest() throws IOException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_BAD_REQUEST)
+                .message( "Bad Request")
+                .addHeader("location", testmeurl)
+                .request(httpget)
+                .build();
+        boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
+        assertTrue(!isRedirected);
+    }
+
+    @Test
+    public void testIsRedirectedSuccessWithStatusCodeMovedTemporarily() throws IOException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_TEMP)
+                .message("Moved Temporarily")
+                .addHeader("location", testmeurl)
+                .request(httpget)
+                .build();
+        boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
+        assertTrue(isRedirected);
+    }
+
+    @Test
+    public void testIsRedirectedSuccessWithStatusCodeMovedPermanently() throws IOException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_PERM)
+                .message("Moved Permanently")
+                .addHeader("location", testmeurl)
+                .request(httpget)
+                .build();
+        boolean isRedirected = redirectHandler.isRedirected(httpget, response, 0, new RedirectOptions());
+        assertTrue(isRedirected);
+    }
+
+    @Test
+    public void testIsRedirectedSuccessWithStatusCodeTemporaryRedirect() throws IOException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(StatusLine.HTTP_TEMP_REDIRECT)
+                .message("Temporary Redirect")
+                .addHeader("location", testmeurl)
+                .request(httpget)
+                .build();
+        boolean isRedirected = redirectHandler.isRedirected(httpget, response,0,new RedirectOptions());
+        assertTrue(isRedirected);
+    }
+
+    @Test
+    public void testIsRedirectedSuccessWithStatusCodeSeeOther() throws IOException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_SEE_OTHER)
+                .message( "See Other")
+                .addHeader("location", testmeurl)
+                .request(httpget)
+                .build();
+        boolean isRedirected = redirectHandler.isRedirected(httpget, response,0,new RedirectOptions());
+        assertTrue(isRedirected);
+    }
+
+    @Test
+    public void testGetRedirectForGetMethod() {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_TEMP)
+                .message("Moved Temporarily")
+                .addHeader("location", testmeurl)
+                .request(httpget)
+                .build();
+        try {
+            Request request = redirectHandler.getRedirect(httpget, response);
+            assertTrue(request != null);
+            final String method = request.method();
+            assertTrue(method.equalsIgnoreCase("GET"));
+        } catch (ProtocolException e) {
+            e.printStackTrace();
+            fail("Redirect handler testGetRedirectForGetMethod failure");
+        }
+    }
+
+    @Test
+    public void testGetRedirectForGetMethodForAuthHeader() {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httpget = new Request.Builder().url(testurl).header("Authorization", "TOKEN").build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_TEMP)
+                .message("Moved Temporarily")
+                .addHeader("location", differenthosturl)
+                .request(httpget)
+                .build();
+
+        try {
+            Request request = redirectHandler.getRedirect(httpget, response);
+            assertTrue(request != null);
+            final String method = request.method();
+            assertTrue(method.equalsIgnoreCase("GET"));
+            String header = request.header("Authorization");
+            assertTrue(header == null);
+        } catch (ProtocolException e) {
+            e.printStackTrace();
+            fail("Redirect handler testGetRedirectForGetMethodForAuthHeader failure");
+        }
+    }
+
+    @Test
+    public void testGetRedirectForHeadMethod() {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httphead = new Request.Builder().url(testurl).method("HEAD", null).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_TEMP)
+                .message("Moved Temporarily")
+                .addHeader("location", testmeurl)
+                .request(httphead)
+                .build();
+        try {
+            Request request = redirectHandler.getRedirect(httphead, response);
+            assertTrue(request != null);
+            final String method = request.method();
+            assertTrue(method.equalsIgnoreCase("HEAD"));
+        } catch (ProtocolException e) {
+            e.printStackTrace();
+            fail("Redirect handler testGetRedirectForHeadMethod failure");
+        }
+    }
+
+    @Test
+    public void testGetRedirectForPostMethod() {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        RequestBody body = RequestBody.create(MediaType.parse("application/json"),"");
+        Request httppost = new Request.Builder().url(testurl).post(body).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_MOVED_TEMP)
+                .message("Moved Temporarily")
+                .addHeader("location", testmeurl)
+                .request(httppost)
+                .build();
+        try {
+            Request request = redirectHandler.getRedirect(httppost, response);
+            assertTrue(request != null);
+            final String method = request.method();
+            assertTrue(method.equalsIgnoreCase("POST"));
+        } catch (ProtocolException e) {
+            e.printStackTrace();
+            fail("Redirect handler testGetRedirectForPostMethod failure");
+        }
+    }
+
+    @Test
+    public void testGetRedirectForPostMethodWithStatusCodeSeeOther() {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httppost = new Request.Builder().url(testurl).build();
+
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_SEE_OTHER)
+                .message("See Other")
+                .addHeader("location", testmeurl)
+                .request(httppost)
+                .build();
+
+        try {
+            Request request = redirectHandler.getRedirect(httppost, response);
+            assertTrue(request != null);
+            final String method = request.method();
+            assertTrue(method.equalsIgnoreCase("GET"));
+        } catch (ProtocolException e) {
+            e.printStackTrace();
+            fail("Redirect handler testGetRedirectForPostMethod1 failure");
+        }
+    }
+
+    @Test
+    public void testGetRedirectForRelativeURL() throws ProtocolException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httppost = new Request.Builder().url(testurl).build();
+
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_SEE_OTHER)
+                .message("See Other")
+                .addHeader("location", "/testrelativeurl")
+                .request(httppost)
+                .build();
+
+            Request request = redirectHandler.getRedirect(httppost, response);
+            assertTrue(request.url().toString().compareTo(testurl+"/testrelativeurl") == 0);
+    }
+
+    @Test
+    public void testGetRedirectRelativeLocationRequestURLwithSlash() throws ProtocolException {
+        RedirectHandler redirectHandler = new RedirectHandler();
+        Request httppost = new Request.Builder().url(testmeurl).build();
+
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_SEE_OTHER)
+                .message("See Other")
+                .addHeader("location", "/testrelativeurl")
+                .request(httppost)
+                .build();
+            Request request = redirectHandler.getRedirect(httppost, response);
+            String expected = "https://graph.microsoft.com/v1.0/me/testrelativeurl";
+            assertTrue(request.url().toString().compareTo(expected) == 0);
+    }
 
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
index d5ddc3915..d9404c992 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
@@ -19,140 +19,140 @@
 
 public class RetryHandlerTest {
 
-	int maxRetries = 2;
-	int retryInterval = 1000;
-	String testmeurl = "https://graph.microsoft.com/v1.0/me";
-	private final int HTTP_SERVER_ERROR = 500;
-
-	@Test
-	public void testRetryHandlerCreation() {
-		RetryHandler retryhandler = new RetryHandler();
-		assertNotNull(retryhandler);
-	}
-
-	@Test
-	public void testRetryHandlerWithRetryOptions() {
-		RetryOptions option = new RetryOptions();
-		RetryHandler retryhandler = new RetryHandler(option);
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
-				.message("Gateway Timeout")
-				.request(httpget)
-				.build();
-		assertTrue(retryhandler.retryRequest(response, 1, httpget, option));
-	}
-
-	@Test
-	public void testRetryHandlerWithCustomRetryOptions() {
-		IShouldRetry shouldRetry = new IShouldRetry() {
-			public boolean shouldRetry(long delay, int executionCount, Request request,Response response){
-				return false;
-			}
-		};
-		RetryOptions option = new RetryOptions(shouldRetry, 5, 0);
-		RetryHandler retryhandler = new RetryHandler(option);
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
-				.message("Gateway Timeout")
-				.request(httpget)
-				.build();
-		assertTrue(!retryhandler.retryRequest(response, 0, httpget, option));
-	}
-
-	@Test
-	public void testRetryRequestWithMaxRetryAttempts() {
-		RetryHandler retryhandler = new RetryHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
-				.message("Gateway Timeout")
-				.request(httpget)
-				.build();
-		// Default retry options with Number of maxretries default to 3
-		RetryOptions retryOptions = new RetryOptions();
-		// Try to execute one more than allowed default max retries
-		int executionCount = RetryOptions.DEFAULT_MAX_RETRIES + 1; 
-		assertFalse(retryhandler.retryRequest(response, executionCount, httpget, retryOptions));
-	}
-
-	@Test
-	public void testRetryRequestForStatusCode() {
-		RetryHandler retryhandler = new RetryHandler();
-		Request httpget = new Request.Builder().url(testmeurl).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				// For status code 500 which is not in (429 503 504), So NO retry
-				.code(HTTP_SERVER_ERROR)  
-				.message( "Internal Server Error")
-				.request(httpget)
-				.build();
-		assertFalse(retryhandler.retryRequest(response, 1, httpget, new RetryOptions()));
-	}
-
-	@Test
-	public void testRetryRequestWithTransferEncoding() {
-		RetryHandler retryhandler = new RetryHandler();
-		Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create(MediaType.parse("application/json"), "TEST")).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)  
-				.message( "gateway timeout")
-				.request(httppost)
-				.addHeader("Transfer-Encoding", "chunked")
-				.build();
-		assertTrue(retryhandler.retryRequest(response, 1, httppost, new RetryOptions()));
-	}
-
-	@Test
-	public void testRetryRequestWithExponentialBackOff() {
-		RetryHandler retryhandler = new RetryHandler();
-		Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create(MediaType.parse("application/json"), "TEST")).build();
-		Response response = new Response.Builder()
-				.protocol(Protocol.HTTP_1_1)
-				.code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)  
-				.message( "gateway timeout")
-				.request(httppost)
-				.addHeader("Transfer-Encoding", "chunked")
-				.build();
-		
-		assertTrue(retryhandler.retryRequest(response, 1, httppost, new RetryOptions()));
-	}
-	
-	@Test
-	public void testGetRetryAfterWithHeader() {
-		RetryHandler retryHandler = new RetryHandler();
-		long delay = retryHandler.getRetryAfter(TestResponse().newBuilder().addHeader("Retry-After", "60").build(), 1, 1);
-		assertTrue(delay == 60000);
-		delay = retryHandler.getRetryAfter(TestResponse().newBuilder().addHeader("Retry-After", "1").build(), 2, 3);
-		assertTrue(delay == 1000);
-	}
-	
-	@Test
-	public void testGetRetryAfterOnFirstExecution() {
-		RetryHandler retryHandler = new RetryHandler();
-		long delay = retryHandler.getRetryAfter(TestResponse(), 3, 1);
-		assertTrue(delay > 3000);
-		delay = retryHandler.getRetryAfter(TestResponse(), 3, 2);
-		assertTrue(delay > 3100);
-	}
-	
-	@Test
-	public void testGetRetryAfterMaxExceed() {
-		RetryHandler retryHandler = new RetryHandler();
-		long delay = retryHandler.getRetryAfter(TestResponse(), 190, 1);
-		assertTrue(delay == 180000);
-	}
-	
-	Response TestResponse() {
-		return new Response.Builder()
-				.code(429)
-				.message("message")
-				.request(new Request.Builder().url("https://localhost").build())
-				.protocol(Protocol.HTTP_1_0).build();
-	}
+    int maxRetries = 2;
+    int retryInterval = 1000;
+    String testmeurl = "https://graph.microsoft.com/v1.0/me";
+    private final int HTTP_SERVER_ERROR = 500;
+
+    @Test
+    public void testRetryHandlerCreation() {
+        RetryHandler retryhandler = new RetryHandler();
+        assertNotNull(retryhandler);
+    }
+
+    @Test
+    public void testRetryHandlerWithRetryOptions() {
+        RetryOptions option = new RetryOptions();
+        RetryHandler retryhandler = new RetryHandler(option);
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
+                .message("Gateway Timeout")
+                .request(httpget)
+                .build();
+        assertTrue(retryhandler.retryRequest(response, 1, httpget, option));
+    }
+
+    @Test
+    public void testRetryHandlerWithCustomRetryOptions() {
+        IShouldRetry shouldRetry = new IShouldRetry() {
+            public boolean shouldRetry(long delay, int executionCount, Request request,Response response){
+                return false;
+            }
+        };
+        RetryOptions option = new RetryOptions(shouldRetry, 5, 0);
+        RetryHandler retryhandler = new RetryHandler(option);
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
+                .message("Gateway Timeout")
+                .request(httpget)
+                .build();
+        assertTrue(!retryhandler.retryRequest(response, 0, httpget, option));
+    }
+
+    @Test
+    public void testRetryRequestWithMaxRetryAttempts() {
+        RetryHandler retryhandler = new RetryHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
+                .message("Gateway Timeout")
+                .request(httpget)
+                .build();
+        // Default retry options with Number of maxretries default to 3
+        RetryOptions retryOptions = new RetryOptions();
+        // Try to execute one more than allowed default max retries
+        int executionCount = RetryOptions.DEFAULT_MAX_RETRIES + 1;
+        assertFalse(retryhandler.retryRequest(response, executionCount, httpget, retryOptions));
+    }
+
+    @Test
+    public void testRetryRequestForStatusCode() {
+        RetryHandler retryhandler = new RetryHandler();
+        Request httpget = new Request.Builder().url(testmeurl).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                // For status code 500 which is not in (429 503 504), So NO retry
+                .code(HTTP_SERVER_ERROR)
+                .message( "Internal Server Error")
+                .request(httpget)
+                .build();
+        assertFalse(retryhandler.retryRequest(response, 1, httpget, new RetryOptions()));
+    }
+
+    @Test
+    public void testRetryRequestWithTransferEncoding() {
+        RetryHandler retryhandler = new RetryHandler();
+        Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create(MediaType.parse("application/json"), "TEST")).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
+                .message( "gateway timeout")
+                .request(httppost)
+                .addHeader("Transfer-Encoding", "chunked")
+                .build();
+        assertTrue(retryhandler.retryRequest(response, 1, httppost, new RetryOptions()));
+    }
+
+    @Test
+    public void testRetryRequestWithExponentialBackOff() {
+        RetryHandler retryhandler = new RetryHandler();
+        Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create(MediaType.parse("application/json"), "TEST")).build();
+        Response response = new Response.Builder()
+                .protocol(Protocol.HTTP_1_1)
+                .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
+                .message( "gateway timeout")
+                .request(httppost)
+                .addHeader("Transfer-Encoding", "chunked")
+                .build();
+
+        assertTrue(retryhandler.retryRequest(response, 1, httppost, new RetryOptions()));
+    }
+
+    @Test
+    public void testGetRetryAfterWithHeader() {
+        RetryHandler retryHandler = new RetryHandler();
+        long delay = retryHandler.getRetryAfter(TestResponse().newBuilder().addHeader("Retry-After", "60").build(), 1, 1);
+        assertTrue(delay == 60000);
+        delay = retryHandler.getRetryAfter(TestResponse().newBuilder().addHeader("Retry-After", "1").build(), 2, 3);
+        assertTrue(delay == 1000);
+    }
+
+    @Test
+    public void testGetRetryAfterOnFirstExecution() {
+        RetryHandler retryHandler = new RetryHandler();
+        long delay = retryHandler.getRetryAfter(TestResponse(), 3, 1);
+        assertTrue(delay > 3000);
+        delay = retryHandler.getRetryAfter(TestResponse(), 3, 2);
+        assertTrue(delay > 3100);
+    }
+
+    @Test
+    public void testGetRetryAfterMaxExceed() {
+        RetryHandler retryHandler = new RetryHandler();
+        long delay = retryHandler.getRetryAfter(TestResponse(), 190, 1);
+        assertTrue(delay == 180000);
+    }
+
+    Response TestResponse() {
+        return new Response.Builder()
+                .code(429)
+                .message("message")
+                .request(new Request.Builder().url("https://localhost").build())
+                .protocol(Protocol.HTTP_1_0).build();
+    }
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
index 9ba6eedb9..900182dbd 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
@@ -8,46 +8,46 @@
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
 
 public class TelemetryOptionsTest {
-	
-	@Test
-	public void createTelemetryOptionsTest() {
-		TelemetryOptions telemetryOptions = new TelemetryOptions();
-		assertNotNull(telemetryOptions);
-		assertNotNull(telemetryOptions.getClientRequestId());
-	}
-	
-	@Test
-	public void setFeatureUsageTest() {
-		TelemetryOptions telemetryOptions = new TelemetryOptions();
-		telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
-		telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
-		assertTrue(telemetryOptions.getSerializedFeatureUsage().compareTo("5")==0);
-	}
-
-	@Test
-	public void getSerializedFeatureUsageTest() {
-		TelemetryOptions telemetryOptions = new TelemetryOptions();
-		telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
-		telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
-		telemetryOptions.setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
-		assertTrue(telemetryOptions.getSerializedFeatureUsage().compareTo("7")==0);
-	}
-
-	@Test
-	public void setClientRequestIdTest() {
-		TelemetryOptions telemetryOptions = new TelemetryOptions();
-		telemetryOptions.setClientRequestId("test id");
-		assertTrue(telemetryOptions.getClientRequestId().compareTo("test id")==0);
-	}
-
-	@Test
-	public void getClientRequestIdTest() {
-		TelemetryOptions telemetryOptions = new TelemetryOptions();
-		assertNotNull(telemetryOptions.getClientRequestId());
-		telemetryOptions.setClientRequestId("test id 1");
-		assertTrue(telemetryOptions.getClientRequestId().compareTo("test id 1")==0);
-		telemetryOptions.setClientRequestId("test id 2");
-		assertTrue(telemetryOptions.getClientRequestId().compareTo("test id 2")==0);
-	}
+
+    @Test
+    public void createTelemetryOptionsTest() {
+        TelemetryOptions telemetryOptions = new TelemetryOptions();
+        assertNotNull(telemetryOptions);
+        assertNotNull(telemetryOptions.getClientRequestId());
+    }
+
+    @Test
+    public void setFeatureUsageTest() {
+        TelemetryOptions telemetryOptions = new TelemetryOptions();
+        telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
+        telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
+        assertTrue(telemetryOptions.getSerializedFeatureUsage().compareTo("5")==0);
+    }
+
+    @Test
+    public void getSerializedFeatureUsageTest() {
+        TelemetryOptions telemetryOptions = new TelemetryOptions();
+        telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
+        telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
+        telemetryOptions.setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
+        assertTrue(telemetryOptions.getSerializedFeatureUsage().compareTo("7")==0);
+    }
+
+    @Test
+    public void setClientRequestIdTest() {
+        TelemetryOptions telemetryOptions = new TelemetryOptions();
+        telemetryOptions.setClientRequestId("test id");
+        assertTrue(telemetryOptions.getClientRequestId().compareTo("test id")==0);
+    }
+
+    @Test
+    public void getClientRequestIdTest() {
+        TelemetryOptions telemetryOptions = new TelemetryOptions();
+        assertNotNull(telemetryOptions.getClientRequestId());
+        telemetryOptions.setClientRequestId("test id 1");
+        assertTrue(telemetryOptions.getClientRequestId().compareTo("test id 1")==0);
+        telemetryOptions.setClientRequestId("test id 2");
+        assertTrue(telemetryOptions.getClientRequestId().compareTo("test id 2")==0);
+    }
 
 }

From f73faa94d8eabe2912e335841dcef19335ab3dd5 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 14 Jan 2021 12:52:21 -0500
Subject: [PATCH 065/213] - bumps min API level to 26

---
 android/build.gradle | 2 +-
 readme.md            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 763f66b71..ba1f56f6e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -29,7 +29,7 @@ android {
     defaultConfig {
         versionCode 1
         versionName "1.0"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
     }
 
diff --git a/readme.md b/readme.md
index 06bc93903..c76104afd 100644
--- a/readme.md
+++ b/readme.md
@@ -120,7 +120,9 @@ The Microsoft Graph SDK is open for contribution. To contribute to this project,
 
 ## 6. Supported Java versions
 
-The Microsoft Graph SDK for Java library is supported at runtime for Java 8+ and [Android API revision 21](http://source.android.com/source/build-numbers.html) and greater.
+The Microsoft Graph SDK for Java library is supported at runtime for Java 8+ and [Android API revision 26](http://source.android.com/source/build-numbers.html) and greater.
+
+Android developers targeting lower android API levels can do so by [enabling desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) in their project.
 
 ## 7. License
 

From 7f27f143e055676bffed77eb45f2525459f13be3 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 15 Jan 2021 16:23:33 -0500
Subject: [PATCH 066/213] - adds code coverage reports

---
 .azure-pipelines/buildAndPackage.yml |  7 +++++++
 .azure-pipelines/prValidate.yml      |  7 +++++++
 build.gradle                         | 19 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index 1e848aa5f..912424330 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -68,6 +68,13 @@ steps:
     javaHomeOption: 'JDKVersion'
     sonarQubeRunAnalysis: false
 
+- task: PublishCodeCoverageResults@1
+  inputs:
+    codeCoverageTool: 'JaCoCo'
+    summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
+    pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
+    failIfCoverageEmpty: true
+
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Artifact: drop'
   inputs:
diff --git a/.azure-pipelines/prValidate.yml b/.azure-pipelines/prValidate.yml
index cf2bd540d..10a10ed3e 100644
--- a/.azure-pipelines/prValidate.yml
+++ b/.azure-pipelines/prValidate.yml
@@ -52,6 +52,13 @@ steps:
     javaHomeOption: 'JDKVersion'
     sonarQubeRunAnalysis: false
 
+- task: PublishCodeCoverageResults@1
+  inputs:
+    codeCoverageTool: 'JaCoCo'
+    summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
+    pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
+    failIfCoverageEmpty: true
+
 - task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
   displayName: 'Graph Client Tooling pipeline fail notification'
   inputs:
diff --git a/build.gradle b/build.gradle
index 85ae0fa73..113a9cc78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,12 +14,30 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'com.jfrog.bintray' version '1.8.5'
+    id 'jacoco'
 }
 
 java {
     modularity.inferModulePath = true
 }
 
+test {
+    finalizedBy jacocoTestReport // report is always generated after tests run
+}
+jacocoTestReport {
+    dependsOn test // tests are required to run before generating the report
+}
+
+jacoco {
+    toolVersion = "0.8.7-SNAPSHOT" //https://github.com/gradle/gradle/issues/15038
+}
+
+jacocoTestReport {
+    reports {
+        xml.enabled true
+    }
+}
+
 sourceSets {
     main {
         java {
@@ -34,6 +52,7 @@ repositories {
     // You can declare any Maven/Ivy/file repository here.
     jcenter()
     mavenCentral()
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // for jacoco, until 0.8.7 gets released
 }
 
 apply from: "gradle/dependencies.gradle"

From 3bac2165d3b45e083ff256fd0ee031415c6354bf Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 09:57:00 -0500
Subject: [PATCH 067/213] - moves all the non-generated classes to the core
 library

---
 .../concurrency/ChunkedUploadProvider.java    | 302 +++++++++
 .../concurrency/ChunkedUploadRequest.java     | 105 +++
 .../ChunkedUploadResponseHandler.java         | 132 ++++
 .../concurrency/ChunkedUploadResult.java      | 131 ++++
 .../graph/concurrency/IProgressCallback.java  |  37 ++
 .../graph/concurrency/IUploadSession.java     |  26 +
 .../com/microsoft/graph/core/BaseClient.java  | 123 ++++
 .../graph/core/BaseGraphServiceClient.java    | 243 +++++++
 .../microsoft/graph/core/ClientException.java |  44 ++
 .../com/microsoft/graph/core/Constants.java   |  31 +
 .../graph/core/CustomRequestBuilder.java      |  56 ++
 .../com/microsoft/graph/core/DateOnly.java    | 110 ++++
 .../microsoft/graph/core/GraphErrorCodes.java | 161 +++++
 .../com/microsoft/graph/core/IBaseClient.java |  79 +++
 .../graph/core/IBaseGraphServiceClient.java   |  37 ++
 .../com/microsoft/graph/core/Multipart.java   | 267 ++++++++
 .../com/microsoft/graph/core/TimeOfDay.java   | 112 ++++
 .../http/BaseActionCollectionRequest.java     | 111 ++++
 .../BaseActionCollectionRequestBuilder.java   |  44 ++
 .../graph/http/BaseActionRequestBuilder.java  |  36 ++
 .../graph/http/BaseCollectionPage.java        | 170 +++++
 ...BaseCollectionReferenceRequestBuilder.java |  55 ++
 .../graph/http/BaseCollectionRequest.java     | 448 +++++++++++++
 .../http/BaseCollectionRequestBuilder.java    |  83 +++
 .../graph/http/BaseCollectionResponse.java    | 113 ++++
 .../BaseCollectionWithReferencesRequest.java  |  63 ++
 ...ollectionWithReferencesRequestBuilder.java |  82 +++
 .../http/BaseDeltaCollectionRequest.java      | 103 +++
 .../http/BaseEntityCollectionRequest.java     |  98 +++
 .../http/BaseFunctionCollectionRequest.java   |  86 +++
 .../BaseFunctionCollectionRequestBuilder.java |  50 ++
 .../http/BaseFunctionRequestBuilder.java      |  44 ++
 .../graph/http/BaseReferenceRequest.java      |  70 ++
 .../http/BaseReferenceRequestBuilder.java     |  80 +++
 .../com/microsoft/graph/http/BaseRequest.java | 597 +++++++++++++++++
 .../graph/http/BaseRequestBuilder.java        | 131 ++++
 .../graph/http/BaseStreamRequest.java         | 320 +++++++++
 .../http/BaseVoidActionCollectionRequest.java | 107 ++++
 .../graph/http/BaseWithReferenceRequest.java  | 138 ++++
 .../http/BaseWithReferenceRequestBuilder.java | 101 +++
 .../http/CoreHttpCallbackFutureWrapper.java   |  26 +
 .../graph/http/CoreHttpProvider.java          | 605 ++++++++++++++++++
 .../microsoft/graph/http/CustomRequest.java   | 197 ++++++
 .../graph/http/DeltaCollectionPage.java       |  82 +++
 .../com/microsoft/graph/http/GraphError.java  |  74 +++
 .../graph/http/GraphErrorResponse.java        |  87 +++
 .../http/GraphFatalServiceException.java      |  71 ++
 .../microsoft/graph/http/GraphInnerError.java |  64 ++
 .../graph/http/GraphServiceException.java     | 422 ++++++++++++
 .../com/microsoft/graph/http/HttpMethod.java  |  54 ++
 .../graph/http/HttpResponseCode.java          |  69 ++
 .../graph/http/HttpResponseHeadersHelper.java |  53 ++
 .../graph/http/ICollectionResponse.java       |  28 +
 .../microsoft/graph/http/IHttpProvider.java   | 137 ++++
 .../microsoft/graph/http/IHttpRequest.java    | 196 ++++++
 .../graph/http/IHttpStreamRequest.java        |  29 +
 .../microsoft/graph/http/IRequestBuilder.java |  60 ++
 .../graph/http/IStatefulResponseHandler.java  |  65 ++
 .../graph/http/PrimitiveRequest.java          |  72 +++
 .../graph/http/PrimitiveRequestBuilder.java   |  75 +++
 .../graph/http/ReferenceRequestBody.java      | 102 +++
 .../microsoft/graph/logger/DefaultLogger.java | 118 ++++
 .../com/microsoft/graph/logger/ILogger.java   |  63 ++
 .../microsoft/graph/logger/LoggerLevel.java   |  38 ++
 .../graph/options/FunctionOption.java         |  39 ++
 .../microsoft/graph/options/HeaderOption.java |  42 ++
 .../com/microsoft/graph/options/Option.java   |  72 +++
 .../microsoft/graph/options/QueryOption.java  |  40 ++
 .../serializer/AdditionalDataManager.java     |  97 +++
 .../graph/serializer/ByteArraySerializer.java |  65 ++
 .../serializer/CollectionPageSerializer.java  | 153 +++++
 .../graph/serializer/DefaultSerializer.java   | 384 +++++++++++
 .../graph/serializer/EnumSetSerializer.java   |  86 +++
 .../FallbackTypeAdapterFactory.java           | 145 +++++
 .../graph/serializer/GsonFactory.java         | 267 ++++++++
 .../graph/serializer/IJsonBackedObject.java   |  67 ++
 .../graph/serializer/ISerializer.java         |  68 ++
 .../serializer/OffsetDateTimeSerializer.java  |  84 +++
 78 files changed, 9522 insertions(+)
 create mode 100644 src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
 create mode 100644 src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
 create mode 100644 src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
 create mode 100644 src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java
 create mode 100644 src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
 create mode 100644 src/main/java/com/microsoft/graph/core/BaseClient.java
 create mode 100644 src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java
 create mode 100644 src/main/java/com/microsoft/graph/core/ClientException.java
 create mode 100644 src/main/java/com/microsoft/graph/core/Constants.java
 create mode 100644 src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/core/DateOnly.java
 create mode 100644 src/main/java/com/microsoft/graph/core/GraphErrorCodes.java
 create mode 100644 src/main/java/com/microsoft/graph/core/IBaseClient.java
 create mode 100644 src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java
 create mode 100644 src/main/java/com/microsoft/graph/core/Multipart.java
 create mode 100644 src/main/java/com/microsoft/graph/core/TimeOfDay.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/CoreHttpCallbackFutureWrapper.java
 create mode 100644 src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
 create mode 100644 src/main/java/com/microsoft/graph/http/CustomRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
 create mode 100644 src/main/java/com/microsoft/graph/http/GraphError.java
 create mode 100644 src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
 create mode 100644 src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
 create mode 100644 src/main/java/com/microsoft/graph/http/GraphInnerError.java
 create mode 100644 src/main/java/com/microsoft/graph/http/GraphServiceException.java
 create mode 100644 src/main/java/com/microsoft/graph/http/HttpMethod.java
 create mode 100644 src/main/java/com/microsoft/graph/http/HttpResponseCode.java
 create mode 100644 src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java
 create mode 100644 src/main/java/com/microsoft/graph/http/ICollectionResponse.java
 create mode 100644 src/main/java/com/microsoft/graph/http/IHttpProvider.java
 create mode 100644 src/main/java/com/microsoft/graph/http/IHttpRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/IRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java
 create mode 100644 src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
 create mode 100644 src/main/java/com/microsoft/graph/logger/DefaultLogger.java
 create mode 100644 src/main/java/com/microsoft/graph/logger/ILogger.java
 create mode 100644 src/main/java/com/microsoft/graph/logger/LoggerLevel.java
 create mode 100644 src/main/java/com/microsoft/graph/options/FunctionOption.java
 create mode 100644 src/main/java/com/microsoft/graph/options/HeaderOption.java
 create mode 100644 src/main/java/com/microsoft/graph/options/Option.java
 create mode 100644 src/main/java/com/microsoft/graph/options/QueryOption.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/GsonFactory.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/ISerializer.java
 create mode 100644 src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
new file mode 100644
index 000000000..e0615814c
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
@@ -0,0 +1,302 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.concurrency;
+
+import com.microsoft.graph.concurrency.ChunkedUploadResponseHandler;
+import com.microsoft.graph.concurrency.ChunkedUploadRequest;
+import com.microsoft.graph.concurrency.ChunkedUploadResult;
+import com.microsoft.graph.concurrency.IUploadSession;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.options.Option;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.InvalidParameterException;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * ChunkedUpload service provider
+ *
+ * @param <UploadType> the upload item type
+ */
+public class ChunkedUploadProvider<UploadType> {
+
+    /**
+     * The default chunk size for upload. Currently set to 5 MiB.
+     */
+    private static final int DEFAULT_CHUNK_SIZE = 5 * 1024 * 1024;
+
+    /**
+     * The required chunk size increment by OneDrive service, which is 320 KiB
+     */
+    private static final int REQUIRED_CHUNK_SIZE_INCREMENT = 320 * 1024;
+
+    /**
+     * The maximum chunk size for a single upload allowed by OneDrive service.
+     * Currently the value is 60 MiB.
+     */
+    private static final int MAXIMUM_CHUNK_SIZE = 60 * 1024 * 1024;
+
+    /**
+     * The client
+     */
+    private final IBaseGraphServiceClient client;
+
+    /**
+     * The input stream
+     */
+    private final InputStream inputStream;
+
+    /**
+     * The upload session URL
+     */
+    private final String uploadUrl;
+
+    /**
+     * The stream size
+     */
+    private final long streamSize;
+
+    /**
+     * The upload response handler
+     */
+    private final ChunkedUploadResponseHandler<UploadType> responseHandler;
+
+    /**
+     * The counter for how many bytes have been read from input stream
+     */
+    private long readSoFar;
+
+    /**
+     * Creates the ChunkedUploadProvider
+     *
+     * @param uploadSession   the initial upload session
+     * @param client          the Graph client
+     * @param inputStream     the input stream
+     * @param streamSize      the stream size
+     * @param uploadTypeClass the upload type class
+     */
+    public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
+                                 @Nonnull final IBaseGraphServiceClient client,
+                                 @Nonnull final InputStream inputStream,
+                                 final long streamSize,
+                                 @Nonnull final Class<UploadType> uploadTypeClass) {
+        if (uploadSession == null) {
+            throw new InvalidParameterException("Upload session is null.");
+        }
+
+        if (client == null) {
+            throw new InvalidParameterException("OneDrive client is null.");
+        }
+
+        if (inputStream == null) {
+            throw new InvalidParameterException("Input stream is null.");
+        }
+
+        if (streamSize <= 0) {
+            throw new InvalidParameterException("Stream size should larger than 0.");
+        }
+
+        this.client = client;
+        this.readSoFar = 0;
+        this.inputStream = inputStream;
+        this.streamSize = streamSize;
+        this.uploadUrl = uploadSession.getUploadUrl();
+        this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass);
+    }
+
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param options  the upload options
+     * @param chunkSize the customized chunk size
+     * @param progressCallback the callback for upload progress
+     * @return a future with the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
+            throws IOException {
+
+        int internalChunkSize = chunkSize;
+        if (internalChunkSize == 0) {
+            internalChunkSize = DEFAULT_CHUNK_SIZE;
+        }
+
+        if (internalChunkSize % REQUIRED_CHUNK_SIZE_INCREMENT != 0) {
+            throw new IllegalArgumentException("Chunk size must be a multiple of 320 KiB");
+        }
+
+        if (internalChunkSize > MAXIMUM_CHUNK_SIZE) {
+            throw new IllegalArgumentException("Please set chunk size smaller than 60 MiB");
+        }
+
+        byte[] buffer = new byte[internalChunkSize];
+
+        while (this.readSoFar < this.streamSize) {
+            int buffRead = 0;
+
+            // inner loop is to work-around the case where read buffer size is limited to less than chunk size by a global setting
+            while (buffRead < internalChunkSize) {
+                int read = 0;
+                read = this.inputStream.read(buffer, buffRead, internalChunkSize - buffRead);
+                if (read == -1) {
+                    break;
+                }
+                buffRead += read;
+            }
+
+            final ChunkedUploadRequest<UploadType> request =
+                    new ChunkedUploadRequest<UploadType>(this.uploadUrl, this.client, options, buffer, buffRead,
+                            this.readSoFar, this.streamSize);
+            final ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
+            // TODO: upload should return a future, use sendfuture instead and the futures should be chained with completableFuture.then apply
+
+            if (result.uploadCompleted()) {
+                if(progressCallback != null) {
+                    progressCallback.progress(this.streamSize, this.streamSize);
+                }
+                return completedFuture(result.getItem());
+            } else if (result.chunkCompleted()) {
+                if(progressCallback != null) {
+                    progressCallback.progress(this.readSoFar, this.streamSize);
+                }
+            } else if (result.hasError()) {
+                return failedFuture(result.getError());
+            }
+
+            this.readSoFar += buffRead;
+        }
+        return failedFuture(new ClientException("Upload did not complete", null));
+    }
+    private CompletableFuture<UploadType> completedFuture(final UploadType result) { // CompletableFuture.completedFuture(result.getItem()); missing on android
+        final CompletableFuture<UploadType> fut = new CompletableFuture<UploadType>();
+        fut.complete(result);
+        return fut;
+    }
+    private CompletableFuture<UploadType> failedFuture(ClientException ex) { // CompletableFuture.failedFuture not available on android
+        final CompletableFuture<UploadType> fut = new CompletableFuture<UploadType>();
+        fut.completeExceptionally(ex);
+        return fut;
+    }
+
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @return a future with the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<UploadType> futureUpload()
+    				throws IOException {
+    	return futureUpload(0);
+    }
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param chunkSize the customized chunk size
+     * @return a future with the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable final int chunkSize)
+    				throws IOException {
+    	return futureUpload(chunkSize, null);
+    }
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param chunkSize the customized chunk size
+     * @param options  the upload options
+     * @return a future with the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable final int chunkSize, @Nullable final List<Option> options)
+    				throws IOException {
+    	return futureUpload(chunkSize, options, null);
+    }
+
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param options  the upload options
+     * @param chunkSize the customized chunk size
+     * @param progressCallback the callback for upload progress
+     * @return the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
+            throws IOException {
+        try {
+            return futureUpload(chunkSize, options, progressCallback).get();
+        } catch (InterruptedException ex) {
+            throw new ClientException("The request was interrupted", ex);
+        } catch (ExecutionException ex) {
+            throw new ClientException("Error while executing the request", ex);
+        }
+    }
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param options  the upload options
+     * @param chunkSize the customized chunk size
+     * @return the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Option> options)
+            throws IOException {
+        return upload(chunkSize, options, null);
+    }
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @param chunkSize the customized chunk size
+     * @return the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public UploadType upload(@Nullable final int chunkSize)
+            throws IOException {
+        return upload(chunkSize, null);
+    }
+    /**
+     * Uploads content to remote upload session based on the input stream
+     *
+     * @return the result
+     * @throws IOException the IO exception that occurred during upload
+     */
+    @Nonnull
+    public UploadType upload()
+            throws IOException {
+        return upload(0);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
new file mode 100644
index 000000000..4fa9de084
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -0,0 +1,105 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.concurrency;
+
+import java.util.List;
+import java.util.Locale;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.concurrency.ChunkedUploadResponseHandler;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.http.BaseRequest;
+import com.microsoft.graph.http.HttpMethod;
+import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.options.Option;
+
+/**
+ * The chunk upload request.
+ * @param <UploadType>    The upload item type.
+ */
+public class ChunkedUploadRequest<UploadType> {
+
+    /**
+     * Content Range header name.
+     */
+    private static final String CONTENT_RANGE_HEADER_NAME = "Content-Range";
+
+    /**
+     * Content Range value format.
+     */
+    private static final String CONTENT_RANGE_FORMAT = "bytes %1$d-%2$d/%3$d";
+
+    /**
+     * The chunk data sent to the server.
+     */
+    private final byte[] data;
+
+    /**
+     * The base request.
+     */
+    private final BaseRequest<ChunkedUploadResult<UploadType>> baseRequest;
+
+    /**
+     * Construct the ChunkedUploadRequest
+     *
+     * @param requestUrl The upload URL.
+     * @param client     The Graph client.
+     * @param options    The query options.
+     * @param chunk      The chunk byte array.
+     * @param chunkSize  The chunk array size.
+     * @param beginIndex The begin index of this chunk in the input stream.
+     * @param totalLength The total length of the input stream.
+     */
+    @SuppressWarnings("unchecked")
+    public ChunkedUploadRequest(@Nonnull final String requestUrl,
+                                @Nonnull final IBaseGraphServiceClient client,
+                                @Nullable final List<? extends Option> options,
+                                @Nonnull final byte[] chunk,
+                                final int chunkSize,
+                                final long beginIndex,
+                                final long totalLength) {
+        this.data = new byte[chunkSize];
+        System.arraycopy(chunk, 0, this.data, 0, chunkSize);
+        this.baseRequest = new BaseRequest<ChunkedUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends ChunkedUploadResult<UploadType>>)(new ChunkedUploadResult<UploadType>((UploadType)null)).getClass()) {
+        };
+        this.baseRequest.setHttpMethod(HttpMethod.PUT);
+        this.baseRequest.addHeader(CONTENT_RANGE_HEADER_NAME,
+                String.format(Locale.ROOT,
+                        CONTENT_RANGE_FORMAT,
+                        beginIndex,
+                        beginIndex + chunkSize - 1,
+                        totalLength));
+    }
+
+    /**
+     * Upload a chunk with tries.
+     *
+     * @param responseHandler The handler to handle the HTTP response.
+     * @return The upload result.
+     */
+    @SuppressWarnings("unchecked")
+    @Nonnull
+    public ChunkedUploadResult<UploadType> upload(
+            @Nonnull final ChunkedUploadResponseHandler<UploadType> responseHandler) {
+        ChunkedUploadResult<UploadType> result = null;
+
+        try {
+            result = this.baseRequest
+                    .getClient()
+                    .getHttpProvider()
+                    .send(baseRequest, (Class<ChunkedUploadResult<UploadType>>)(Class<?>) ChunkedUploadResult.class, this.data, responseHandler);
+        } catch (final ClientException e) {
+            throw new ClientException("Request failed with error, retry if necessary.", e);
+        }
+
+        if (result != null && result.chunkCompleted()) {
+            return result;
+        } else
+            return new ChunkedUploadResult<UploadType>(
+                new ClientException("Upload session failed.", null));
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
new file mode 100644
index 000000000..b0f8dce82
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -0,0 +1,132 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.concurrency;
+
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.core.Constants;
+import com.microsoft.graph.http.GraphServiceException;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.http.HttpResponseCode;
+import com.microsoft.graph.http.HttpResponseHeadersHelper;
+import com.microsoft.graph.http.IHttpRequest;
+import com.microsoft.graph.http.IStatefulResponseHandler;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.concurrency.IUploadSession;
+import com.microsoft.graph.concurrency.ChunkedUploadResult;
+import com.microsoft.graph.serializer.ISerializer;
+
+import okhttp3.Response;
+
+/**
+ * Handles the stateful response from the OneDrive upload session
+ *
+ * @param <UploadType> the expected uploaded item
+ */
+public class ChunkedUploadResponseHandler<UploadType>
+		implements IStatefulResponseHandler<ChunkedUploadResult<UploadType>, UploadType> {
+
+	private final static HttpResponseHeadersHelper  responseHeadersHelper = new HttpResponseHeadersHelper();
+	/**
+	 * The expected deserialized upload type
+	 */
+	private final Class<UploadType> deserializeTypeClass;
+
+	/**
+	 * Creates a chunked upload response handler
+	 *
+	 * @param uploadType the expected upload item type
+	 */
+	public ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType) {
+		this.deserializeTypeClass = uploadType;
+	}
+
+	/**
+	 * Do nothing before getting the response
+	 *
+	 * @param response The response
+	 */
+	@Override
+	public void configConnection(@Nonnull final Response response) {
+		return;
+	}
+
+	/**
+	 * Generate the chunked upload response result
+	 *
+	 * @param request	the HTTP request
+	 * @param response the HTTP response
+	 * @param serializer the serializer
+	 * @param logger	 the system logger
+	 * @return the chunked upload result, which could be either an uploaded item or error
+	 * @throws Exception an exception occurs if the request was unable to complete for any reason
+	 */
+	@Override
+	@Nullable
+	public ChunkedUploadResult<UploadType> generateResult(
+			@Nonnull final IHttpRequest request,
+			@Nonnull final Response response,
+			@Nonnull final ISerializer serializer,
+			@Nonnull final ILogger logger) throws Exception {
+		if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+			logger.logDebug("Receiving error during upload, see detail on result error");
+
+			return new ChunkedUploadResult<UploadType>(
+					GraphServiceException.createFromResponse(request, null, serializer,
+						response, logger));
+		} else if (response.code() >= HttpResponseCode.HTTP_OK
+				&& response.code() < HttpResponseCode.HTTP_MULTIPLE_CHOICES) {
+			final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
+			final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
+			final String location = headers.get("Location");
+			if(contentType != null
+				&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
+				try (final InputStream in = new BufferedInputStream(response.body().byteStream())) {
+					final String rawJson = CoreHttpProvider.streamToString(in);
+					final IUploadSession session = serializer.deserializeObject(rawJson, IUploadSession.class);
+					if(session == null || session.getNextExpectedRanges() == null) {
+						logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
+						final UploadType uploadedItem = serializer.deserializeObject(rawJson, this.deserializeTypeClass);
+						return new ChunkedUploadResult<UploadType>(uploadedItem);
+					} else {
+						logger.logDebug("Chunk bytes has been accepted by the server.");
+						return new ChunkedUploadResult<UploadType>(session);
+					}
+				}
+			} else if(location != null) {
+				logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
+				return new ChunkedUploadResult<UploadType>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
+			} else {
+				logger.logDebug("Upload session returned an unexpected response");
+			}
+		}
+		return new ChunkedUploadResult<UploadType>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
new file mode 100644
index 000000000..4a4104641
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
@@ -0,0 +1,131 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.concurrency;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.http.GraphServiceException;
+import com.microsoft.graph.concurrency.IUploadSession;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Wrapper class for different upload response from server.
+ */
+public class ChunkedUploadResult<UploadType> {
+    /**
+     * The uploaded item response.
+     */
+    private final UploadType uploadedItem;
+
+    /**
+     * The next session response.
+     */
+    private final IUploadSession session;
+
+    /**
+     * The error happened during upload.
+     */
+    private final ClientException error;
+
+    /**
+     * Construct result with item created.
+     *
+     * @param uploaded The created item.
+     */
+    public ChunkedUploadResult(@Nullable final UploadType uploaded) {
+        this.uploadedItem = uploaded;
+        this.session = null;
+        this.error = null;
+    }
+
+    /**
+     * Construct result with next session.
+     *
+     * @param session The next session.
+     */
+    public ChunkedUploadResult(@Nullable final IUploadSession session) {
+        this.session = session;
+        this.uploadedItem = null;
+        this.error = null;
+    }
+
+    /**
+     * Construct result with error.
+     *
+     * @param error The error occurred during uploading.
+     */
+    public ChunkedUploadResult(@Nullable final ClientException error) {
+        this.error = error;
+        this.uploadedItem = null;
+        this.session = null;
+    }
+
+    /**
+     * Construct result with server exception.
+     *
+     * @param exception The exception received from server.
+     */
+    public ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
+        this(new ClientException(exception.getMessage(/* verbose */ true), exception));
+    }
+
+    /**
+     * Checks the chunk upload is completed.
+     *
+     * @return true if current chunk upload is completed.
+     */
+    public boolean chunkCompleted() {
+        return this.uploadedItem != null || this.session != null;
+    }
+
+    /**
+     * Checks the whole upload is completed.
+     *
+     * @return true if the response is an item.
+     */
+    public boolean uploadCompleted() {
+        return this.uploadedItem != null;
+    }
+
+    /**
+     * Checks if an error happened.
+     *
+     * @return true if current request has error.
+     */
+    public boolean hasError() {
+        return this.error != null;
+    }
+
+    /**
+     * Get the uploaded item.
+     *
+     * @return The item.
+     */
+    @Nullable
+    public UploadType getItem() {
+        return this.uploadedItem;
+    }
+
+    /**
+     * Get the next session.
+     *
+     * @return The next session for uploading.
+     */
+    @Nullable
+    public IUploadSession getSession() {
+        return this.session;
+    }
+
+    /**
+     * Get the error.
+     *
+     * @return The error.
+     */
+    @Nullable
+    public ClientException getError() {
+        return this.error;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java b/src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java
new file mode 100644
index 000000000..66a295e5c
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java
@@ -0,0 +1,37 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.concurrency;
+
+/**
+ * A callback that describes how to deal with success, failure, and progress
+ */
+public interface IProgressCallback {
+
+    /**
+     * How progress updates are handled for this callback
+     *
+     * @param current the current amount of progress
+     * @param max     the max amount of progress
+     */
+    void progress(final long current, final long max);
+}
diff --git a/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java b/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
new file mode 100644
index 000000000..f19e38670
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
@@ -0,0 +1,26 @@
+package com.microsoft.graph.concurrency;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+/**
+ * The interface for the Upload Session.
+ */
+public interface IUploadSession {
+
+    /**
+     * Gets the Upload Url.
+     * The URL endpoint that accepts PUT requests for byte ranges of the file.
+     * @return the upload Url
+     */
+    @Nullable
+    String getUploadUrl();
+    /**
+     * Gets the Next Expected Ranges.
+     * A collection of byte ranges that the server is missing for the file. These ranges are zero indexed and of the format 'start-end' (e.g. '0-26' to indicate the first 27 bytes of the file). When uploading files as Outlook attachments, instead of a collection of ranges, this property always indicates a single value '{start}', the location in the file where the next upload should begin.
+     * @return the Next Expected Ranges.
+     */
+    @Nullable
+    List<String> getNextExpectedRanges();
+}
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
new file mode 100644
index 000000000..2e1c68bf9
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -0,0 +1,123 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.core;
+
+import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.ISerializer;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A client that communications with an OData service
+ */
+public abstract class BaseClient implements IBaseClient {
+    /**
+     * The HTTP provider instance
+     */
+    private IHttpProvider httpProvider;
+
+    /**
+     * The logger
+     */
+    private ILogger logger;
+
+    /**
+     * The serializer instance
+     */
+    private ISerializer serializer;
+
+    /**
+     * Gets the HTTP provider
+     *
+     * @return The HTTP provider
+     */
+    @Override
+    @Nullable
+    public IHttpProvider getHttpProvider() {
+        return httpProvider;
+    }
+
+    /**
+     * Gets the logger
+     *
+     * @return The logger
+     */
+    @Nullable
+    public ILogger getLogger() {
+        return logger;
+    }
+
+    /**
+     * Gets the serializer
+     *
+     * @return The serializer
+     */
+    @Override
+    @Nullable
+    public ISerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Validates this client
+     */
+    @Override
+    public void validate() {
+        if (httpProvider == null) {
+            throw new NullPointerException("HttpProvider");
+        }
+
+        if (serializer == null) {
+            throw new NullPointerException("Serializer");
+        }
+    }
+
+    /**
+     * Sets the logger
+     *
+     * @param logger The logger
+     */
+    protected void setLogger(@Nonnull final ILogger logger) {
+        this.logger = logger;
+    }
+
+    /**
+     * Sets the HTTP provider
+     *
+     * @param httpProvider The HTTP provider
+     */
+    protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
+        this.httpProvider = httpProvider;
+    }
+
+    /**
+     * Sets the serializer
+     *
+     * @param serializer The serializer
+     */
+    public void setSerializer(@Nonnull final ISerializer serializer) {
+        this.serializer = serializer;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java b/src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java
new file mode 100644
index 000000000..32be3db34
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java
@@ -0,0 +1,243 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.core;
+
+import com.microsoft.graph.core.ClientException;
+
+import com.microsoft.graph.httpcore.HttpClients;
+import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
+import com.microsoft.graph.logger.*;
+import com.google.gson.JsonObject;
+import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.serializer.DefaultSerializer;
+import com.microsoft.graph.serializer.ISerializer;
+import com.microsoft.graph.core.CustomRequestBuilder;
+
+import okhttp3.OkHttpClient;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+
+/**
+ * The class for the Graph Service Client.
+ */
+public class BaseGraphServiceClient extends BaseClient implements IBaseGraphServiceClient {
+
+	/**
+	 * Restricted constructor
+	 */
+	protected BaseGraphServiceClient() {
+    }
+
+    /**
+     * The default endpoint for the Microsoft Graph Service
+     */
+    public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
+
+    /**
+     * The current endpoint
+     */
+    private String endpoint;
+
+    @Override
+    @Nonnull
+    public String getServiceRoot() {
+        if (endpoint == null) {
+            endpoint = DEFAULT_GRAPH_ENDPOINT;
+        }
+        return endpoint;
+    }
+
+    @Override
+    public void setServiceRoot(@Nonnull final String value) {
+        endpoint = value;
+    }
+
+	/**
+	 * Send a custom request to Graph
+	 *
+	 * @param url
+	 *			the full URL to make a request with
+	 * @param responseType
+	 *			the response class to deserialize the response into
+	 * @return the instance of this builder
+	 */
+	@Nonnull
+	public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType) {
+		return new CustomRequestBuilder<T>(getServiceRoot() + url, this, null, responseType);
+	}
+
+	/**
+	 * Send a custom request to Graph
+	 *
+	 * @param url
+	 *			the full URL to make a request with
+	 * @return the instance of this builder
+	 */
+	@Nonnull
+	public CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url) {
+		return new CustomRequestBuilder<JsonObject>(getServiceRoot() + url, this, null,
+				JsonObject.class);
+	}
+
+	/**
+	 * Gets the builder to start configuring the client
+	 *
+	 * @return builder to start configuring the client
+	 */
+	@Nonnull
+	public static Builder<OkHttpClient> builder() {
+		return new Builder<OkHttpClient>();
+	}
+
+	/**
+	 * Builder to help configure the Graph service client
+	 */
+	public static final class Builder<httpClientType> {
+		private ISerializer serializer;
+		private IHttpProvider httpProvider;
+		private ILogger logger;
+		private httpClientType httpClient;
+		private ICoreAuthenticationProvider auth;
+
+		private ICoreAuthenticationProvider getAuth() {
+			if(auth == null) {
+				throw new NullPointerException("auth"); // TODO initialize to default once moved to core
+			} else {
+				return auth;
+			}
+		}
+		private ILogger getLogger() {
+			if(logger == null) {
+				return new DefaultLogger();
+			} else {
+				return logger;
+			}
+		}
+		private ISerializer getSerializer() {
+			if(serializer == null) {
+				return new DefaultSerializer(getLogger());
+			} else {
+				return serializer;
+			}
+		}
+		@SuppressWarnings("unchecked")
+		private httpClientType getHttpClient() {
+			if(httpClient == null) {
+				return (httpClientType)HttpClients.createDefault(getAuth());
+			} else {
+				return httpClient;
+			}
+		}
+		private IHttpProvider getHttpProvider() {
+			if(httpProvider == null) {
+				return new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
+			} else {
+				return httpProvider;
+			}
+		}
+
+		/**
+		 * Sets the serializer.
+		 *
+		 * @param serializer
+		 *			the serializer
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
+			checkNotNull(serializer, "serializer");
+			this.serializer = serializer;
+			return this;
+		}
+
+		/**
+		 * Sets the httpProvider
+		 *
+		 * @param httpProvider
+		 *			the httpProvider
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
+			checkNotNull(httpProvider, "httpProvider");
+			this.httpProvider = httpProvider;
+			return this;
+		}
+
+		/**
+		 * Sets the logger
+		 *
+		 * @param logger
+		 *			the logger
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
+			checkNotNull(logger, "logger");
+			this.logger = logger;
+			return this;
+		}
+
+		/**
+		 * Sets the http client
+		 *
+		 * @param client the http client
+		 *
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
+			checkNotNull(client, "client");
+			this.httpClient = client;
+			return this;
+		}
+
+		/**
+		 * Sets the authentication provider
+		 *
+		 * @param auth the authentication provider
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthenticationProvider auth) {
+			checkNotNull(auth, "auth");
+			this.auth = auth;
+			return this;
+		}
+
+		/**
+		 * Builds and returns the Graph service client.
+		 *
+		 * @return the Graph service client object
+		 * @throws ClientException
+		 *			 if there was an exception creating the client
+		 */
+		@Nonnull
+		public IBaseGraphServiceClient buildClient() throws ClientException {
+			BaseGraphServiceClient client = new BaseGraphServiceClient();
+			client.setHttpProvider(this.getHttpProvider());
+			client.setLogger(this.getLogger());
+			client.setSerializer(this.getSerializer());
+			client.validate();
+			return client;
+		}
+	}
+
+	/**
+	 * Checks whether the provided object is null or not and throws an exception if it is
+	 *
+	 * @param o object to check
+	 * @param name name to use in the exception message
+	 */
+	protected static void checkNotNull(@Nullable final Object o, @Nonnull final String name) {
+		if (o==null) {
+			throw new NullPointerException(name + " cannot be null");
+		}
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/core/ClientException.java b/src/main/java/com/microsoft/graph/core/ClientException.java
new file mode 100644
index 000000000..a5ab34469
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/ClientException.java
@@ -0,0 +1,44 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.core;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An exception from the client.
+ */
+public class ClientException extends RuntimeException {
+
+    private static final long serialVersionUID = -1066560879567392559L;
+
+    /**
+     * Creates the client exception
+     * 
+     * @param message the message to display
+     * @param ex      the exception from
+     */
+    public ClientException(@Nonnull final String message, @Nullable final Throwable ex) {
+        super(message, ex);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/core/Constants.java b/src/main/java/com/microsoft/graph/core/Constants.java
new file mode 100644
index 000000000..474f47fad
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/Constants.java
@@ -0,0 +1,31 @@
+package com.microsoft.graph.core;
+
+/** Multi-purpose constants holder used accross the SDK */
+public final class Constants {
+	private Constants() {
+	}
+	/**
+	 * The content type header
+	 */
+	public static final String CONTENT_TYPE_HEADER_NAME = "Content-Type";
+	/**
+	 * The encoding type for getBytes
+	 */
+	public static final String JSON_ENCODING = "UTF-8";
+	/**
+	 * The content type for JSON responses
+	 */
+    public static final String JSON_CONTENT_TYPE = "application/json";
+    /**
+	 * The content type for TEXT responses
+	 */
+	public static final String TEXT_CONTENT_TYPE = "text/plain";
+	/**
+	 * The binary content type header's value
+	 */
+	public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
+
+	/** The SDK version */
+	public static final String VERSION_NAME = "2.5.0";
+}
+
diff --git a/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java b/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
new file mode 100644
index 000000000..1b878a037
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
@@ -0,0 +1,56 @@
+package com.microsoft.graph.core;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.http.CustomRequest;
+import com.microsoft.graph.options.Option;
+
+/**
+ * The class for the CustomRequestBuilder
+ *
+ * If the provided URL is malformed, the ClientException will contain a MalformedURLException
+ */
+public class CustomRequestBuilder<T> extends BaseRequestBuilder<T> {
+	/** Type to use for response deserialization */
+	public final Class<T> responseType;
+	
+	/**
+	 * Instanciates a new custom request builder
+	 * 
+	 * @param requestUrl the URL to send the request to
+	 * @param client the client to use for the request
+	 * @param requestOptions options to apply to the request
+	 * @param responseType type to use for response deserialization
+	 */
+	public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final List<? extends Option> requestOptions, @Nonnull final Class<T> responseType) {
+		super(requestUrl, client, requestOptions);
+		this.responseType = responseType;
+	}
+	
+	/**
+	 * Builds the request to be executed
+	 * 
+	 * @return the request to be executed
+	 * @param requestOptions the options to apply to the request
+	 */
+	@Nonnull
+	public CustomRequest<T> buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
+		return buildRequest(getOptions(requestOptions));
+	}
+	
+	/**
+	 * Builds the request to be executed
+	 * 
+	 * @return the request to be executed
+	 * @param requestOptions the options to apply to the request
+	 */
+	@Nonnull
+	public CustomRequest<T> buildRequest(@Nullable final List<? extends Option> requestOptions) {
+		return new CustomRequest<T>(getRequestUrl(), getClient(), requestOptions, responseType);
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/core/DateOnly.java b/src/main/java/com/microsoft/graph/core/DateOnly.java
new file mode 100644
index 000000000..76ee7b722
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/DateOnly.java
@@ -0,0 +1,110 @@
+package com.microsoft.graph.core;
+
+
+import java.text.ParseException;
+import java.util.Locale;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A timezone-nonspecific date
+ */
+public class DateOnly {
+
+    /**
+     * The year
+     */
+    private final int mYear;
+
+    /**
+     * The month
+     */
+    private final int mMonth;
+
+    /**
+     * The day
+     */
+    private final int mDay;
+
+    /**
+     * Constructs a timezone-nonspecific DateOnly
+     *
+     * @param dateStr date string of the form <code>yyyy-mm-dd</code>
+     * @return the parsed DateOnly instance
+     * @exception ParseException If there was a failure parsing the dateStr
+     */
+    @Nullable
+    public static DateOnly parse(@Nonnull final String dateStr) throws ParseException {
+        // break the date up into its constituent parts
+        final String[] dateInfo = dateStr.split("-");
+
+        // validate the split date string
+        final int expectedLength = 3;
+        if (dateInfo.length != expectedLength) {
+            throw new ParseException(
+                    "Expected datestring format 'yyyy-mm-dd' but found: " + dateStr, 0
+            );
+        }
+
+        // array indices for date parsing
+        final int indYear = 0;
+        final int indMonth = 1;
+        final int indDay = 2;
+
+        // unpack this array
+        int year = Integer.parseInt(dateInfo[indYear]);
+        int month = Integer.parseInt(dateInfo[indMonth]);
+        int day = Integer.parseInt(dateInfo[indDay]);
+
+        return new DateOnly(year, month, day);
+    }
+
+    /**
+     * Constructs a timezone-nonspecific DateOnly
+     *
+     * @param year  the year
+     * @param month 1-indexed month value (Jan == 1)
+     * @param day   day of the month
+     */
+    public DateOnly(final int year, final int month, final int day) {
+        mYear = year;
+        mMonth = month;
+        mDay = day;
+    }
+
+    /**
+     * Gets the year
+     *
+     * @return the year
+     */
+    public int getYear() {
+        return mYear;
+    }
+
+    /**
+     * Gets the month
+     *
+     * @return the month
+     */
+    public int getMonth() {
+        return mMonth;
+    }
+
+    /**
+     * Gets the day
+     *
+     * @return the day
+     */
+    public int getDay() {
+        return mDay;
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+                Locale.ROOT,
+                "%04d-%02d-%02d", mYear, mMonth, mDay
+        );
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/core/GraphErrorCodes.java b/src/main/java/com/microsoft/graph/core/GraphErrorCodes.java
new file mode 100644
index 000000000..8a7cbaaf8
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/GraphErrorCodes.java
@@ -0,0 +1,161 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.core;
+
+/**
+ * The common Graph error codes
+ * @see <a href="https://docs.microsoft.com/en-us/graph/errors">https://docs.microsoft.com/en-us/graph/errors</a>
+ */
+public enum GraphErrorCodes {
+    // Standard error codes.
+    /** The collar doesn't have permission to perform the action */
+    ACCESS_DENIED,
+    /** The app or user has been throttled */
+    ACTIVITY_LIMIT_REACHED,
+    /** No description available */
+    ASYNC_TASK_FAILED,
+    /** No description available */
+    ASYNC_TASK_NOT_COMPLETED,
+    /** No description available */
+    AUTHENTICATION_CANCELLED,
+    /** No description available */
+    AUTHENTICATION_FAILURE,
+    /** An unspecified error has occurred. */
+    GENERAL_EXCEPTION,
+    /**	The specified byte range is invalid or unavailable. */
+    INVALID_RANGE,
+    /** The request is malformed or incorrect. */
+    INVALID_REQUEST,
+    /** The resource could not be found. */
+    ITEM_NOT_FOUND,
+    /** Malware was detected in the requested resource. */
+    MALWARE_DETECTED,
+    /** The specified item name already exists. */
+    NAME_ALREADY_EXISTS,
+    /** The action is not allowed by the system. */
+    NOT_ALLOWED,
+    /** The request is not supported by the system. */
+    NOT_SUPPORTED,
+    /** The user has reached their quota limit. */
+    QUOTA_LIMIT_REACHED,
+    /** The resource being updated has changed since the caller last read it, usually an eTag mismatch. */
+    RESOURCE_MODIFIED,
+    /** The delta token is no longer valid, and the app must reset the sync state. */
+    RESYNC_REQUIRED,
+    /** The service is not available. Try the request again after a delay. There may be a Retry-After header. */
+    SERVICE_NOT_AVAILABLE,
+    /** The application is sending too many requests to the service. Try the request again after a delay. There may be a Retry-After header. */
+    TOO_MANY_REDIRECTS,
+    /** The caller is not authenticated. */
+    UNAUTHENTICATED,
+
+    // Extend error codes.
+    /** No description available */
+    ACCESS_RESTRICTED,
+    /** Access restricted to the item's owner. */
+    AUTHORIZATION_REQUEST_DENIED,
+    /** Failed to get a consistent delta snapshot. Try again later. */
+    CANNOT_SNAPSHOT_TREE,
+    /** Max limit on the number of child items was reached. */
+    CHILD_ITEM_COUNT_EXCEEDED,
+    /** No description available */
+    ERROR_INVALID_ID_MALFORMED,
+    /** No description available */
+    ERROR_INVALID_USER,
+    /** ETag does not match the current item's value. */
+    ENTITY_TAG_DOES_NOT_MATCH,
+    /** Declared total size for this fragment is different from that of the upload session. */
+    FRAGMENT_LENGTH_MISMATCH,
+    /** Uploaded fragment is out of order. */
+    FRAGMENT_OUT_OF_ORDER,
+    /** Uploaded fragment overlaps with existing data. */
+    FRAGMENT_OVERLAP,
+    /** Invalid accept type. */
+    INVALID_ACCEPT_TYPE,
+    /** Invalid parameter format. */
+    INVALID_PARAMETER_FORMAT,
+    /** Name contains invalid characters. */
+    INVALID_PATH,
+    /** Invalid query option. */
+    INVALID_QUERY_OPTION,
+    /** Invalid start index. */
+    INVALID_START_INDEX,
+    /** Lock token does not match existing lock. */
+    LOCK_MISMATCH,
+    /** There is currently no unexpired lock on the item. */
+    LOCK_NOT_FOUND_OR_ALREADY_EXPIRED,
+    /** Lock Owner ID does not match provided ID. */
+    LOCK_OWNER_MISMATCH,
+    /** ETag header is malformed. ETags must be quoted strings. */
+    MALFORMED_ENTITY_TAG,
+    /** Max limit on number of Documents is reached. */
+    MAX_DOCUMENT_COUNT_EXCEEDED,
+    /** Max file size exceeded. */
+    MAX_FILE_SIZE_EXCEEDED,
+    /** Max limit on number of Folders is reached. */
+    MAX_FOLDER_COUNT_EXCEEDED,
+    /** Max file size exceeded. */
+    MAX_FRAGMENT_LENGTH_EXCEEDED,
+    /** Max limit on number of Items is reached. */
+    MAX_ITEM_COUNT_EXCEEDED,
+    /** Max query length exceeded. */
+    MAX_QUERY_LENGTH_EXCEEDED,
+    /** Maximum stream size exceeded. */
+    MAX_STREAM_SIZE_EXCEEDED,
+    /** Parameter Exceeds Maximum Length. */
+    PARAMETER_IS_TOO_LONG,
+    /** Parameter is smaller then minimum value. */
+    PARAMETER_IS_TOO_SMALL,
+    /** Path exceeds maximum length. */
+    PATH_IS_TOO_LONG,
+    /** Folder hierarchy depth limit reached. */
+    PATH_TOO_DEEP,
+    /** Property not updateable. */
+    PROPERTY_NOT_UPDATEABLE,
+    /** Resync required. Replace any local items with the server's version (including deletes) if you're sure that the service was up to date with your local changes when you last sync'd. Upload any local changes that the server doesn't know about. */
+    RESYNC_APPLY_DIFFERENCES,
+    /** Resync required. Upload any local items that the service did not return, and upload any files that differ from the server's version (keeping both copies if you're not sure which one is more up-to-date). */
+    RESYNC_UPLOAD_DIFFERENCES,
+    /** Resource is temporarily read-only. */
+    SERVICE_READ_ONLY,
+    /** Too many requests. */
+    THROTTLED_REQUEST,
+    /** Too many results requested. */
+    TOO_MANY_RESULTS_REQUESTED,
+    /** Too many terms in the query. */
+    TOO_MANY_TERMS_IN_QUERY,
+    /** Operation is not allowed because the number of affected items exceeds threshold. */
+    TOTAL_AFFECTED_ITEM_COUNT_EXCEEDED,
+    /** Data truncation is not allowed. */
+    TRUNCATION_NOT_ALLOWED,
+    /** Upload session failed. */
+    UPLOAD_SESSION_FAILED,
+    /** Upload session incomplete. */
+    UPLOAD_SESSION_INCOMPLETE,
+    /** Upload session not found. */
+    UPLOAD_SESSION_NOT_FOUND,
+    /** This document is suspicious and may have a virus. */
+    VIRUS_SUSPICIOUS,
+    /** Zero or fewer results requested. */
+    ZERO_OR_FEWER_RESULTS_REQUESTED,
+}
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
new file mode 100644
index 000000000..25e74322c
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -0,0 +1,79 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.core;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * A client that communications with an OData service
+ */
+public interface IBaseClient {
+    /**
+     * Gets the service root
+     *
+     * @return the service root
+     */
+    @Nonnull
+    String getServiceRoot();
+
+    /**
+     * Sets the service root
+     *
+     * @param value the service root
+     */
+    void setServiceRoot(@Nonnull final String value);
+
+    /**
+     * Gets the HTTP provider
+     *
+     * @return the HTTP provider
+     */
+    @Nullable
+    IHttpProvider getHttpProvider();
+
+    /**
+     * Gets the logger
+     *
+     * @return the logger
+     */
+    @Nullable
+    ILogger getLogger();
+
+    /**
+     * Gets the serializer
+     *
+     * @return the serializer
+     */
+    @Nullable
+    ISerializer getSerializer();
+
+    /**
+     * Validates this client
+     */
+    void validate();
+}
diff --git a/src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java b/src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java
new file mode 100644
index 000000000..232a530a5
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java
@@ -0,0 +1,37 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.core;
+
+import com.google.gson.JsonObject;
+
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.CustomRequestBuilder;
+
+/**
+ * The interface for the Graph Service Client.
+ */
+public interface IBaseGraphServiceClient extends IBaseClient {
+
+    /**
+     * Gets a builder to execute a custom request
+     *
+     * @return the custom request builder
+     * @param url the url to send the request to
+     * @param responseType the class to deserialize the response to
+     * @param <T> the type to deserialize the response to
+     */
+    @Nonnull
+    <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType);
+
+    /**
+     * Gets a builder to execute a custom request with a generic JSONObject response
+     *
+     * @return the custom request builder
+     * @param url the url to send the request to
+     */
+    @Nonnull
+    CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url);
+}
diff --git a/src/main/java/com/microsoft/graph/core/Multipart.java b/src/main/java/com/microsoft/graph/core/Multipart.java
new file mode 100644
index 000000000..9b83ce480
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/Multipart.java
@@ -0,0 +1,267 @@
+package com.microsoft.graph.core;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.microsoft.graph.options.HeaderOption;
+
+/**
+ * Helper for submitting multipart data
+ * 
+ * This follows the Network Working Group's RFC 
+ * on multipart/form-data posting format:
+ * https://www.ietf.org/rfc/rfc2388.txt
+ */
+public class Multipart {
+	private String boundary;
+	private static final String RETURN = "\r\n";
+	private ByteArrayOutputStream out;
+	/** Default encoding for multi-part requests */
+	public static final String MULTIPART_ENCODING = "US-ASCII";
+	private String contentType = "multipart/form-data";
+	
+	/**
+	 * Create a new multipart object
+	 */
+	public Multipart() {
+		out = new ByteArrayOutputStream();
+		boundary = "part_" + new BigInteger(130, new SecureRandom()).toString();
+	}
+	
+	/**
+	 * Get the multipart boundary for use in the request header
+	 * @return the multipart boundary
+	 */
+	@Nonnull
+	public String getBoundary() {
+		return boundary;
+	}
+	
+	/**
+	 * Set the multipart boundary for use in the request header
+	 * @param boundary The multipart boundary
+	 */
+	public void setBoundary(@Nonnull final String boundary) {
+		this.boundary = boundary;
+	}
+	
+	/**
+	 * Get the contentType for use in the request header
+	 * @return the multipart Content-Type
+	 */
+	@Nonnull
+	public String getContentType() {
+		return contentType;
+	}
+	
+	/**
+	 * Set the contentType for use in the request header
+	 * @param contentType The multipart Content-Type
+	 */
+	public void setContentType(@Nonnull final String contentType) {
+		this.contentType = contentType;
+	}
+	
+	/**
+	 * Get the Content-Type header to send the multipart request
+	 * @return the multipart header option
+	 */
+	@Nonnull
+	public HeaderOption header() {
+		return new HeaderOption("Content-Type", contentType + "; boundary=\"" + boundary + "\"");
+	}
+	
+	private void writePartData(String partContent, byte[] byteArray) throws IOException{
+		out.write(partContent.getBytes(MULTIPART_ENCODING));
+		out.write(byteArray);
+		String returnContent = RETURN + RETURN;
+		out.write(returnContent.getBytes(MULTIPART_ENCODING));
+	}
+	
+	/**
+	 * Create content headers value and parameter
+	 * @param name The content header name
+	 * @param contentType The content header Content-Type
+	 * @param filename The content header filename 
+	 * @return content header value and parameter string 
+	 */
+	@VisibleForTesting
+	String createPartHeader(String name, String contentType, String filename) {
+		StringBuilder partContent = new StringBuilder(addBoundary());
+		partContent.append("Content-Disposition: form-data");
+        if(filename != null) {
+        	if(name != null) 
+        		partContent.append("; name=\"").append(name).append("\"; filename=\"").append(filename).append("\"");
+        	else 
+        		partContent.append("; filename=\"").append(filename).append("\"");
+        }
+        else if(name != null) 
+        	partContent.append("; name=\"").append(name).append("\"");
+        if(contentType != null)
+        	partContent.append(RETURN).append("Content-Type: ").append(contentType);
+        partContent.append(RETURN).append(RETURN);
+        return partContent.toString();
+	}
+	
+	/**
+	 * Create content headers value and parameter
+	 * @param contentValue The content header value
+	 * @param contentDispParameter Map containing content paramter's key and value pair 
+	 * @return content header value and parameter string 
+	 */
+	@Nonnull
+	public static String createContentHeaderValue(@Nonnull final String contentValue, @Nullable final Map<String, String> contentDispParameter) {
+		String contentHeaderValue = contentValue;
+
+		if(contentDispParameter != null) {
+			for(Map.Entry<String,String> entry : contentDispParameter.entrySet())
+				contentHeaderValue += ";" + entry.getKey() + "=\"" + entry.getValue() + "\"";
+		}
+		return contentHeaderValue;
+	}
+	
+	/**
+	 * Create content headers header-name, value and parameter string
+	 * @param headers Map containing Header-name and header-value pair
+	 */
+	private String createPartHeader(Map<String, String> headers) {
+        String partContent = addBoundary();
+        String defaultPartContent = "Content-Disposition: form-data;" + RETURN + "Content-Type: " + contentType + RETURN + RETURN;
+        
+        if(headers != null) {         
+              for(Map.Entry<String,String> entry : headers.entrySet())
+                    partContent += entry.getKey() +": "+entry.getValue() + RETURN;
+              partContent += RETURN;
+        }
+        else 
+              partContent += defaultPartContent;  
+        return partContent;
+	}
+
+	/**
+	 * Add multipart content headers and byte content
+	 * @param name The multipart content name
+	 * @param contentType The multipart Content-Type
+	 * @param filename The multipart content file name
+	 * @param byteArray The multipart byte content
+	 * @throws IOException
+	 */
+	private void addData(String name, String contentType, String filename, byte[] byteArray) throws IOException {
+        String partContent = createPartHeader(name, contentType, filename);
+        writePartData(partContent, byteArray);
+	}
+
+	/**
+	 * Add a part to the multipart body
+	 * @param name The name of the part
+	 * @param contentType The MIME type (text/html, video/mp4, etc.)
+	 * @param byteArray The byte[] contents of the resource
+	 * @throws IOException Throws an exception if the output stream cannot be written to
+	 */
+	public void addFormData(@Nonnull final String name, @Nonnull final String contentType, @Nonnull final byte[] byteArray) throws IOException {
+		addData(name, contentType, null, byteArray);
+	}
+	
+	/**
+	 * Add a part to the multipart body
+	 * @param contentType The MIME type (text/html, video/mp4, etc.)
+	 * @param byteArray The byte[] contents of the resource
+	 * @throws IOException Throws an exception if the output stream cannot be written to
+	 */
+	public void addPart(@Nonnull final String contentType, @Nonnull final byte[] byteArray) throws IOException {
+		addData(null, contentType, null, byteArray);
+	}
+	
+	/**
+     * Add a part to the multipart body
+     * @param headers Map containing Header's header-name(eg: Content-Disposition, Content-Type, etc..) and header's value-parameter string
+     * @param content The byte[] contents of the resource
+     * @throws IOException Throws an exception if the output stream cannot be written to
+     */
+     public void addPart(@Nonnull final Map<String, String> headers, @Nonnull final byte[] content) throws IOException{
+           final String partContent = createPartHeader(headers);
+           writePartData(partContent, content);
+     }
+	
+	/**
+	 * Add an HTML part to the multipart body
+	 * @param name The name of the part
+	 * @param content The HTML body for the part
+	 * @throws IOException Throws an exception if the output stream cannot be written to
+	 */
+	public void addHtmlPart(@Nonnull final String name, @Nonnull final byte[] content) throws IOException {
+		addFormData(name, "text/html", content);
+	}
+	
+	/**
+	 * Add a file part to the multipart body
+	 * @param name The name of the part
+	 * @param contentType The MIME type of the file (application/pdf, video/mp4, etc.)
+	 * @param file The file
+	 * @throws IOException Throws an exception if the output stream cannot be written to
+	 */
+	public void addFilePart(@Nonnull final String name, @Nonnull final String contentType, @Nonnull final java.io.File file) throws IOException {
+		final InputStream fileStream = new FileInputStream(file);
+		final byte[] fileBytes = getByteArray(fileStream);
+		addData(name, contentType, file.getName(), fileBytes);
+	}
+	
+	/**
+	 * Adds a boundary at the beginning of a new part
+	 * @return The boundary
+	 */
+	private String addBoundary() {
+		return "--" + boundary + RETURN;
+	}
+	
+	/**
+	 * Adds a boundary at the end of the multipart body
+	 * @return The boundary
+	 */
+	private String addEnding() {
+		return "--" + boundary + "--";
+	}
+	
+	/**
+	 * Returns a full multipart body byte array
+	 * @return The byte[] representation of the multipart object
+	 * @throws IOException Throws an exception if the output stream cannot be written to
+	 */
+	@Nullable
+	public byte[] content() throws IOException {
+		ByteArrayOutputStream finalStream = out;
+		finalStream.write(addEnding().getBytes(MULTIPART_ENCODING));
+		return finalStream.toByteArray();
+	}
+	
+    /**
+     * Helper method to convert an InputStream to a byte[]
+     * @param in The input stream to convert
+     * @return The byte[]
+     * @throws IOException Throws an exception if the output stream cannot be written to
+     */
+    private byte[] getByteArray(final InputStream in) throws IOException {
+		try (final ByteArrayOutputStream buffer = new ByteArrayOutputStream()){
+			int nRead;
+			byte[] data = new byte[16384];
+			try {
+				while ((nRead = in.read(data, 0, data.length)) != -1) {
+					buffer.write(data, 0, nRead);
+				}
+			} finally {
+				in.close();
+			}
+			buffer.flush();
+			return buffer.toByteArray();
+		}
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/core/TimeOfDay.java b/src/main/java/com/microsoft/graph/core/TimeOfDay.java
new file mode 100644
index 000000000..a49cb71d5
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/core/TimeOfDay.java
@@ -0,0 +1,112 @@
+package com.microsoft.graph.core;
+
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Locale;
+
+/**
+ * The time of day
+ */
+public class TimeOfDay {
+
+    /**
+     * The hour
+     */
+    private final int mHour;
+
+    /**
+     * The minute
+     */
+    private final int mMinute;
+
+    /**
+     * The second
+     */
+    private final int mSecond;
+
+    /**
+     * Constructs a timezone-nonspecific DateOnly
+     *
+     * @param timeStr time string of the form <code>HH:mm:ss</code>
+     * @return the parsed DateOnly instance
+     * @exception ParseException If there was a failure parsing the dateStr
+     */
+    @Nullable
+    public static TimeOfDay parse(@Nonnull final String timeStr) throws ParseException {
+        // break the date up into its constituent parts
+        final String[] timeInfo = timeStr.split(":");
+
+        // validate the split date string
+        final int expectedLength = 3;
+        if (timeInfo.length != expectedLength) {
+            throw new ParseException(
+                    "Expected time string format 'HH:mm:ss' but found: " + timeStr, 0
+            );
+        }
+
+        // array indices for date parsing
+        final int indHour = 0;
+        final int indMinute = 1;
+        final int indSecond = 2;
+
+        // unpack this array
+        final int hour = Integer.parseInt(timeInfo[indHour]);
+        final int minute = Integer.parseInt(timeInfo[indMinute]);
+        final int second = new BigDecimal(timeInfo[indSecond]).intValue();
+
+        return new TimeOfDay(hour, minute, second);
+    }
+
+    /**
+     * Constructs a TimeOfDay object
+     *
+     * @param hour   the hour
+     * @param minute the minute
+     * @param second the second
+     */
+    public TimeOfDay(final int hour, final int minute, final int second) {
+        mHour = hour;
+        mMinute = minute;
+        mSecond = second;
+    }
+
+    /**
+     * Gets the hour
+     *
+     * @return the hour
+     */
+    public int getHour() {
+        return mHour;
+    }
+
+    /**
+     * Gets the minute
+     *
+     * @return the minute
+     */
+    public int getMinute() {
+        return mMinute;
+    }
+
+    /**
+     * Gets the second
+     *
+     * @return the second
+     */
+    public int getSecond() {
+        return mSecond;
+    }
+
+    @Override
+    @Nonnull
+    public String toString() {
+        return String.format(
+                Locale.ROOT,
+                "%02d:%02d:%02d", mHour, mMinute, mSecond
+        );
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
new file mode 100644
index 000000000..a80058d24
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
@@ -0,0 +1,111 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.net.URL;
+import java.lang.NoSuchFieldException;
+import java.lang.IllegalAccessException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.ICollectionResponse;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.options.Option;
+
+/**
+ * A request against a collection bound action
+ *
+ * @param <T> the type of the object in the collection
+ * @param <T2> the response collection type
+ * @param <T3> the collection page type
+ */
+public abstract class BaseActionCollectionRequest<T, T2 extends ICollectionResponse<T>,
+                                            T3 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>> extends BaseCollectionRequest<T, T2, T3> {
+
+
+    /**
+     * Create the collection request
+     *
+     * @param requestUrl          the URL to make the request against
+     * @param client              the client which can issue the request
+     * @param options             the options for this request
+     * @param responseCollectionClass       the class for the response collection
+     * @param collectionPageClass the class for the collection page
+     * @param collectionRequestBuilderClass the class for the collection request builder
+     */
+    public BaseActionCollectionRequest(@Nonnull final String requestUrl,
+                                 @Nonnull final IBaseClient client,
+                                 @Nullable final List<? extends Option> options,
+                                 @Nonnull final Class<T2> responseCollectionClass,
+                                 @Nonnull final Class<T3> collectionPageClass,
+                                 @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
+        super(requestUrl, client, options, responseCollectionClass, collectionPageClass, collectionRequestBuilderClass);
+    }
+
+    /**
+     * Invokes the method and calls the callback with the resulting collection of objects
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T3> futurePost() {
+        getBaseRequest().setHttpMethod(HttpMethod.POST);
+        Object bodyToSend = null;
+        try {
+            bodyToSend = this.getClass().getField("body").get(this);
+        } catch (NoSuchFieldException | IllegalAccessException ex) {
+            // this action doesn't body arguments, expected, no-op
+        }
+        return getBaseRequest()
+                            .getClient()
+                            .getHttpProvider()
+                            .futureSend(this,
+                                responseCollectionClass,
+                                bodyToSend)
+                            .thenApply(r -> buildFromResponse(r));
+    }
+    /**
+     * Invokes the method and returns the resulting collection of objects
+     * @return a collection of objects returned by the method
+     */
+    @Nullable
+    public T3 post() throws ClientException {
+        getBaseRequest().setHttpMethod(HttpMethod.POST);
+        Object bodyToSend = null;
+        try {
+            bodyToSend = this.getClass().getField("body").get(this);
+        } catch (NoSuchFieldException | IllegalAccessException ex) {
+            // this action doesn't body arguments, expected, no-op
+        }
+        return buildFromResponse(getBaseRequest()
+                                    .getClient()
+                                    .getHttpProvider()
+                                    .send(this,
+                                        responseCollectionClass,
+                                        bodyToSend)
+                                );
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java
new file mode 100644
index 000000000..f315271c6
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java
@@ -0,0 +1,44 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.options.Option;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * The base method request builder class used for POST actions
+ */
+public class BaseActionCollectionRequestBuilder<T, T2 extends BaseRequestBuilder<T>,
+                                                T3 extends ICollectionResponse<T>,
+                                                T4 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>,
+                                                T5 extends BaseCollectionRequest<T, T3, T4>> extends BaseCollectionRequestBuilder<T, T2, T3, T4, T5> {
+
+    /**
+     * Constructs a new {@link BaseActionCollectionRequestBuilder}
+     *
+     * @param requestUrl the URL for the request
+     * @param client     the {@link IBaseClient} for handling requests
+     * @param options    {@link List} of {@link Option}s to add to this request
+     * @param requestBuilderClass the class for the request builder
+     * @param collectionRequestClass the class for the collection request
+     */
+    public BaseActionCollectionRequestBuilder(
+            @Nonnull final String requestUrl,
+            @Nonnull final IBaseClient client,
+            @Nullable final List<? extends Option> options,
+            @Nonnull final Class<T2> requestBuilderClass,
+            @Nonnull final Class<T5> collectionRequestClass
+    ) {
+        super(requestUrl, client, options, requestBuilderClass, collectionRequestClass);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java
new file mode 100644
index 000000000..46427e0a5
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java
@@ -0,0 +1,36 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.options.Option;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The base method request builder class used for POST actions
+ */
+public class BaseActionRequestBuilder<T> extends BaseRequestBuilder<T> {
+    /**
+     * Constructs a new {@link BaseActionRequestBuilder}
+     *
+     * @param requestUrl the URL for the request
+     * @param client     the {@link IBaseClient} for handling requests
+     * @param options    {@link List} of {@link Option}s to add to this request
+     */
+    public BaseActionRequestBuilder(
+            @Nonnull final String requestUrl,
+            @Nonnull final IBaseClient client,
+            @Nullable final List<? extends Option> options
+    ) {
+        super(requestUrl, client, options);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
new file mode 100644
index 000000000..4512cad31
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
@@ -0,0 +1,170 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.JsonObject;
+import com.microsoft.graph.serializer.AdditionalDataManager;
+import com.microsoft.graph.serializer.ISerializer;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A page of results from a collection
+ *
+ * @param <T> the type of the item contained within the collection
+ */
+public class BaseCollectionPage<T, T2 extends BaseRequestBuilder<T>> implements IJsonBackedObject {
+
+    private AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    /**
+     * The contents of this page
+     */
+    private final List<T> pageContents;
+
+    /**
+     * The request builder for the next page
+     */
+    private final T2 requestBuilder;
+
+    /**
+     * The raw representation of this class
+     */
+    private JsonObject rawObject;
+
+    /**
+     * The serializer
+     */
+    private ISerializer serializer;
+
+    /**
+     * A collection page for WorkforceIntegration
+     *
+     * @param response the serialized WorkforceIntegrationCollectionResponse from the service
+     * @param builder  the request builder for the next collection page
+     */
+    public BaseCollectionPage(@Nonnull final ICollectionResponse<T> response, @Nullable final T2 builder) {
+        this(response.values(), builder, response.additionalDataManager());
+    }
+
+    /**
+     * Creates the collection page
+     *
+     * @param pageContents       the contents of this page
+     * @param nextRequestBuilder the request builder for the next page
+     */
+    public BaseCollectionPage(@Nonnull final List<T> pageContents, @Nullable final T2 nextRequestBuilder) {
+        // CollectionPages are never directly modifiable, either 'update'/'delete' the specific child or 'add' the new
+        // object to the 'children' of the collection.
+        this.pageContents = Collections.unmodifiableList(pageContents == null ? new ArrayList<T>() : pageContents);
+        requestBuilder = nextRequestBuilder;
+    }
+
+    /**
+     * Creates the collection page
+     *
+     * @param pageContents       the contents of this page
+     * @param nextRequestBuilder the request builder for the next page
+     * @param responseAdditionalData the additional data returned by the response
+     */
+    public BaseCollectionPage(@Nonnull final List<T> pageContents, @Nonnull final T2 nextRequestBuilder, @Nonnull final AdditionalDataManager responseAdditionalData) {
+        this(pageContents, nextRequestBuilder);
+        this.additionalDataManager().putAll(responseAdditionalData);
+    }
+
+    /**
+     * Gets the next page request builder
+     *
+     * @return the next page request builder
+     */
+    @Nullable
+    public T2 getNextPage() {
+        return requestBuilder;
+    }
+
+    /**
+     * Gets the current page
+     *
+     * @return the current page
+     */
+    @Nonnull
+    public List<T> getCurrentPage() {
+        return pageContents;
+    }
+
+    /**
+     * Gets the raw representation of this class
+     *
+     * @return the raw representation of this class
+     */
+    @Nullable
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+
+    /**
+     * Gets the serializer
+     *
+     * @return the serializer
+     */
+    @Override
+    @Nullable
+    public ISerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json       the JSON object to set this object to
+     */
+    public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
+        this.serializer = serializer;
+        rawObject = json;
+    }
+
+    @Override
+    @Nullable
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+
+    private final static String odataCountKey = "@odata.count";
+    /**
+     * Returns the odata count value if it has been requested, null otherwise
+     * @return the odata count value if it has been requested, null otherwise
+     */
+    @Nullable
+    public final Long getCount() {
+        return additionalDataManager == null || !additionalDataManager.containsKey(odataCountKey) || !additionalDataManager.get(odataCountKey).isJsonPrimitive() ?
+                        null :
+                        additionalDataManager.get(odataCountKey).getAsLong();
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java
new file mode 100644
index 000000000..326a11c37
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java
@@ -0,0 +1,55 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.Option;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * A request builder
+ */
+public class BaseCollectionReferenceRequestBuilder<T, T2 extends BaseRequestBuilder<T>,
+                                                    T3 extends ICollectionResponse<T>,
+                                                    T4 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>,
+                                                    T5 extends BaseEntityCollectionRequest<T, T3, T4>> extends BaseCollectionRequestBuilder<T, T2, T3, T4, T5> {
+    /**
+     * The request builder for this collection
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param requestBuilderClass the class for the request builder
+     * @param collectionRequestClass the class for the collection request
+     */
+    public BaseCollectionReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+										@Nonnull final Class<T2> requestBuilderClass,
+										@Nonnull final Class<T5> collectionRequestClass) {
+        super(requestUrl, client, requestOptions, requestBuilderClass, collectionRequestClass);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
new file mode 100644
index 000000000..5470eb417
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -0,0 +1,448 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.net.URL;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.ICollectionResponse;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+
+import okhttp3.Request;
+
+/**
+ * A request against a collection
+ *
+ * @param <T> the type of the object in the collection
+ * @param <T2> the response collection type
+ * @param <T3> the collection page type
+ */
+public abstract class BaseCollectionRequest<T, T2 extends ICollectionResponse<T>,
+                                            T3 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>> implements IHttpRequest {
+
+    /**
+     * The base request for this collection request
+     */
+    private final BaseRequest<T2> baseRequest;
+
+    /**
+     * The class for the response collection
+     */
+    protected final Class<T2> responseCollectionClass;
+
+    /**
+     * The class for the collection page
+     */
+    private final Class<T3> collectionPageClass;
+
+    private final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collRequestBuilderClass;
+
+
+    /**
+     * Create the collection request
+     *
+     * @param requestUrl          the URL to make the request against
+     * @param client              the client which can issue the request
+     * @param options             the options for this request
+     * @param responseCollectionClass       the class for the response collection
+     * @param collectionPageClass the class for the collection page
+     * @param collectionRequestBuilderClass the class for the collection request builder
+     */
+    public BaseCollectionRequest(@Nonnull final String requestUrl,
+                                 @Nonnull final IBaseClient client,
+                                 @Nullable final List<? extends Option> options,
+                                 @Nonnull final Class<T2> responseCollectionClass,
+                                 @Nonnull final Class<T3> collectionPageClass,
+                                 @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
+        this.responseCollectionClass = responseCollectionClass;
+        this.collectionPageClass = collectionPageClass;
+        this.collRequestBuilderClass = collectionRequestBuilderClass;
+        baseRequest = new BaseRequest<T2>(requestUrl, client, options, responseCollectionClass) {};
+    }
+
+    /**
+     * Send this request
+     *
+     * @return the response object
+     * @deprecated use the future API instead
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected T2 send() throws ClientException {
+        baseRequest.setHttpMethod(HttpMethod.GET);
+        return baseRequest.getClient().getHttpProvider().send(this, responseCollectionClass, null);
+    }
+    /**
+     * Send this request
+     *
+     * @return the response object
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected java.util.concurrent.CompletableFuture<T2> futureSend() throws ClientException {
+        baseRequest.setHttpMethod(HttpMethod.GET);
+        return baseRequest.getClient().getHttpProvider().futureSend(this, responseCollectionClass, null);
+    }
+
+    /**
+     * Deserializes the collection from the response object
+     *
+     * @param response the collection response
+     * @return the collection page
+     */
+    @Nullable
+    public T3 buildFromResponse(@Nonnull final T2 response) {
+        final List<com.microsoft.graph.options.Option> options = new java.util.ArrayList<com.microsoft.graph.options.Option>();
+        try {
+            final Object builder = this.collRequestBuilderClass
+                    .getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                    .newInstance(response.nextLink(), getBaseRequest().getClient(), options);
+            final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), builder.getClass()).newInstance(response, response.nextLink() == null ? null : builder);
+            page.setRawObject(response.getSerializer(), response.getRawObject());
+            return page;
+        } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+        }
+    }
+
+    /**
+     * Gets the request URL
+     *
+     * @return the request URL
+     */
+    @Override
+    @Nonnull
+    public URL getRequestUrl() {
+        return baseRequest.getRequestUrl();
+    }
+
+    /**
+     * Gets the HTTP method
+     *
+     * @return the HTTP method
+     */
+    @Override
+    @Nullable
+    public HttpMethod getHttpMethod() {
+        return baseRequest.getHttpMethod();
+    }
+
+    /**
+     * Gets the headers
+     *
+     * @return the headers
+     */
+    @Override
+    @Nullable
+    public List<HeaderOption> getHeaders() {
+        return baseRequest.getHeaders();
+    }
+
+    /**
+     * Adds a header to this request
+     *
+     * @param header the name of the header
+     * @param value  the value of the header
+     */
+    @Override
+    public void addHeader(@Nonnull final String header, @Nonnull final String value) {
+        baseRequest.addHeader(header, value);
+    }
+
+    /**
+     * Sets useCaches parameter to cache the response
+     *
+     * @param useCaches the value of useCaches
+     */
+    @Override
+    public void setUseCaches(boolean useCaches) {
+        baseRequest.setUseCaches(useCaches);
+    }
+
+    /**
+     * Gets useCaches parameter
+     *
+     * @return the value of useCaches
+     */
+    @Override
+    public boolean getUseCaches() {
+        return baseRequest.getUseCaches();
+    }
+
+    /**
+     * Gets the full list of options for this request
+     *
+     * @return the full list of options for this request
+     */
+    @Nullable
+    public List<Option> getOptions() {
+        return baseRequest.getOptions();
+    }
+
+    /**
+     * Adds a query option
+     *
+     * @param option the query option to add
+     */
+    public void addQueryOption(@Nonnull final QueryOption option) {
+        baseRequest.getQueryOptions().add(option);
+    }
+
+    /**
+     * Sets the expand clause for the request
+     *
+     * @param value the expand clause
+     */
+    protected void addExpandOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$expand", value));
+    }
+
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     */
+    protected void addFilterOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$filter", value));
+    }
+
+    /**
+     * Sets the order by clause for the request
+     *
+     * @param value the order by clause
+     */
+    protected void addOrderByOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$orderby", value));
+    }
+
+    /**
+     * Sets the select clause for the request
+     *
+     * @param value the select clause
+     */
+    protected void addSelectOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$select", value));
+    }
+
+    /**
+     * Sets the top value for the request
+     *
+     * @param value the max number of items to return
+     */
+    protected void addTopOption(final int value) {
+        addQueryOption(new QueryOption("$top", String.valueOf(value)));
+    }
+
+    /**
+     * Sets the skip value for the request
+     *
+     * @param value of the number of items to skip
+     */
+    protected void addSkipOption(final int value) {
+        addQueryOption(new QueryOption("$skip", String.valueOf(value)));
+    }
+
+
+    /**
+     * Add Skip token for pagination
+     * @param skipToken - Token for pagination
+     */
+    protected void addSkipTokenOption(@Nonnull final String skipToken) {
+    	addQueryOption(new QueryOption("$skiptoken", skipToken));
+    }
+
+    /**
+     * Adds the count query string value for the request
+     * @param value - Wheter to return the count or not
+     */
+    protected void addCountOption(final boolean value) {
+        addQueryOption(new QueryOption("$count", String.valueOf(value)));
+    }
+
+    /**
+     * Adds a query option
+     *
+     * @param option the query option to add
+     */
+    public void addFunctionOption(@Nonnull final FunctionOption option) {
+        baseRequest.getFunctionOptions().add(option);
+    }
+
+    /**
+     * Gets the base request for this collection request
+     *
+     * @return the base request for this collection request
+     */
+    @Nonnull
+    public BaseRequest<T2> getBaseRequest() {
+        return baseRequest;
+    }
+
+    /**
+     * Gets the class for the collection page
+     *
+     * @return the class for the collection page
+     */
+    @Nonnull
+    public Class<T3> getCollectionPageClass() {
+        return collectionPageClass;
+    }
+
+    /**
+     * Sets the max redirects
+     *
+     * @param maxRedirects Max redirects that a request can take
+     */
+    public void setMaxRedirects(int maxRedirects) {
+    	baseRequest.setMaxRedirects(maxRedirects);
+    }
+
+    /**
+     * Gets the max redirects
+     *
+     * @return Max redirects that a request can take
+     */
+    public int getMaxRedirects() {
+    	return baseRequest.getMaxRedirects();
+    }
+
+    /**
+     * Sets the should redirect callback
+     *
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    public void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect) {
+    	baseRequest.setShouldRedirect(shouldRedirect);
+    }
+
+    /**
+     * Gets the should redirect callback
+     *
+     * @return Callback which is called before redirect
+     */
+    @Nullable
+    public IShouldRedirect getShouldRedirect() {
+    	return baseRequest.getShouldRedirect();
+    }
+
+    /**
+     * Sets the should retry callback
+     *
+     * @param shouldretry The callback called before retry
+     */
+    public void setShouldRetry(@Nonnull IShouldRetry shouldretry) {
+    	baseRequest.setShouldRetry(shouldretry);
+    }
+
+    /**
+     * Gets the should retry callback
+     *
+     * @return Callback called before retry
+     */
+    @Nullable
+    public IShouldRetry getShouldRetry() {
+    	return baseRequest.getShouldRetry();
+    }
+
+    /**
+     * Sets the max retries
+     *
+     * @param maxRetries Max retries for a request
+     */
+    public void setMaxRetries(int maxRetries) {
+    	baseRequest.setMaxRedirects(maxRetries);
+    }
+
+    /**
+     * Gets max retries
+     *
+     * @return Max retries for a request
+     */
+    public int getMaxRetries() {
+    	return baseRequest.getMaxRetries();
+    }
+
+    /**
+     * Sets the delay in seconds between retires
+     *
+     * @param delay Delay in seconds between retries
+     */
+    public void setDelay(long delay) {
+    	baseRequest.setDelay(delay);
+    }
+
+    /**
+     * Gets delay between retries
+     *
+     * @return Delay between retries in seconds
+     */
+    public long getDelay() {
+    	return baseRequest.getDelay();
+    }
+
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    @Nullable
+    public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        baseRequest.setHttpMethod(httpMethod);
+        return this;
+    }
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Override
+    @Nullable
+    public Request getHttpRequest() throws ClientException {
+        return baseRequest.getHttpRequest();
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response
+     * @return the Request object to be executed
+     */
+    @Override
+    @Nullable
+    public <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+        return baseRequest.getHttpRequest(serializedObject);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
new file mode 100644
index 000000000..9d2402612
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
@@ -0,0 +1,83 @@
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+
+import java.lang.reflect.InvocationTargetException;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The basic implementation of a collection request builder
+ * @param <T> the entity or complex type
+ * @param <T2> the entity request builder type
+ * @param <T3> the collection response type
+ * @param <T4> the collection page type
+ * @param <T5> the collection request type
+ */
+public class BaseCollectionRequestBuilder<T, T2 extends BaseRequestBuilder<T>,
+                                            T3 extends ICollectionResponse<T>,
+                                            T4 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>,
+											T5 extends BaseCollectionRequest<T, T3, T4>> extends BaseRequestBuilder<T> {
+	private final Class<T5> collRequestClass;
+    private final Class<T2> reqBuilderClass;
+	/**
+     * The request builder for this collection of ServicePrincipal
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param requestBuilderClass the class for the request builder
+     * @param collectionRequestClass the class for the collection request
+     */
+	public BaseCollectionRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+                                        @Nonnull final Class<T2> requestBuilderClass,
+										@Nonnull final Class<T5> collectionRequestClass) {
+        super(requestUrl, client, requestOptions);
+		this.collRequestClass = collectionRequestClass;
+        this.reqBuilderClass = requestBuilderClass;
+    }
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    @Nullable
+    public T5 buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
+    }
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    @Nullable
+    public T5 buildRequest(@Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
+        try {
+            return collRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                                    .newInstance(getRequestUrl(), getClient(), requestOptions);
+        } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+		}
+    }
+
+    /**
+     * Gets a builder to request an item within a collection
+     * 
+     * @return builder to request an item within a collection
+     * @param id identifier for the item
+     */
+    @Nullable
+    public T2 byId(@Nonnull final String id) {
+        try {
+            return reqBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                                .newInstance(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
+        } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+		}
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
new file mode 100644
index 000000000..a560d0ad9
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
@@ -0,0 +1,113 @@
+package com.microsoft.graph.http;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.annotations.Expose;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.ISerializer;
+import com.microsoft.graph.serializer.AdditionalDataManager;
+import com.microsoft.graph.http.ICollectionResponse;
+
+/**
+ * The basic collection response implementation
+ * 
+ * @param <T> the entity or complex type
+ */
+public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T>, IJsonBackedObject  {
+	
+	/**
+     * The list of items within this collection page
+     */
+	@SerializedName("value")
+    @Expose
+    @Nullable
+	public java.util.List<T> value;
+	
+
+	/**
+     * The list of items within this collection page
+     */
+    @Override
+    @Nullable
+    public java.util.List<T> values() {
+        return value;
+	}
+
+    /** The link to the next page returned by the initial request if any. */
+	@SerializedName("@odata.nextLink")
+    @Expose(serialize = false)
+    @Nullable
+    public String nextLink;
+	
+    @Override
+    @Nullable
+    public String nextLink() {
+        return nextLink;
+    }
+
+    private transient AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    @Override
+    @Nonnull
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+
+    /**
+     * The raw representation of this class
+     */
+    @Nullable
+    protected JsonObject rawObject;
+
+    /**
+     * The serializer
+     */
+    @Nullable
+	protected ISerializer serializer;
+	
+	/**
+     * Gets the raw representation of this class
+     *
+     * @return the raw representation of this class
+     */
+    @Nullable
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+
+    /**
+     * Gets serializer
+     *
+     * @return the serializer
+     */
+    @Override
+    @Nullable
+    public ISerializer getSerializer() {
+        return serializer;
+	}
+
+	/**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json the JSON object to set this object to
+     */
+    public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
+        this.serializer = serializer;
+        rawObject = json;
+        if (json.has("value")) {
+            final JsonArray array = json.getAsJsonArray("value");
+            for (int i = 0; i < array.size(); i++) {
+				final Object targetObject = value.get(i);
+				if(targetObject instanceof IJsonBackedObject && array.get(i).isJsonObject()) {
+					((IJsonBackedObject)targetObject).setRawObject(serializer, array.get(i).getAsJsonObject());
+				}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java
new file mode 100644
index 000000000..82aec19ca
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java
@@ -0,0 +1,63 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.Option;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An HTTP request.
+ *
+ * @param <T> the response class
+ */
+public abstract class BaseCollectionWithReferencesRequest<T,T2 extends BaseWithReferenceRequest<T>,
+                                        T3 extends BaseReferenceRequestBuilder<T, ? extends BaseReferenceRequest<T>>,
+                                        T4 extends BaseWithReferenceRequestBuilder<T, T2, T3>,
+                                        T5 extends ICollectionResponse<T>,
+                                        T6 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>,
+                                        T7 extends BaseEntityCollectionRequest<T, T5, T6>> extends BaseEntityCollectionRequest<T, T5, T6> {
+
+    /**
+     * The request builder for this collection of User
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param collectionResponseClass the class for the collection response
+     * @param collectionPageClass the class for the collection page
+     * @param collectionWithReferencesRequestBuilderClass the class for the request builder
+     */
+    public BaseCollectionWithReferencesRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+                                                @Nonnull final Class<T5> collectionResponseClass,
+                                                @Nonnull final Class<T6> collectionPageClass,
+                                                @Nonnull final Class<? extends BaseCollectionWithReferencesRequestBuilder<T, T2, T3, T4, T5, T6, ? extends BaseCollectionWithReferencesRequest<T, T2, T3, T4, T5, T6, T7>, ? extends BaseCollectionReferenceRequestBuilder<T, T3, T5, T6, ? extends BaseCollectionWithReferencesRequest<T, T2, T3, T4, T5, T6, T7>>>> collectionWithReferencesRequestBuilderClass) {
+        super(requestUrl, client, requestOptions, collectionResponseClass, collectionPageClass, collectionWithReferencesRequestBuilderClass);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
new file mode 100644
index 000000000..bc647d28b
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
@@ -0,0 +1,82 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.Option;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Arrays;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A request builder
+ */
+public abstract class BaseCollectionWithReferencesRequestBuilder<T, T2 extends BaseWithReferenceRequest<T>,
+                            T3 extends BaseReferenceRequestBuilder<T, ? extends BaseReferenceRequest<T>>,
+                            T4 extends BaseWithReferenceRequestBuilder<T, T2, T3>,
+                            T5 extends ICollectionResponse<T>,
+                            T6 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>,
+                            T7 extends BaseCollectionWithReferencesRequest<T, T2, T3, T4, T5, T6, ? extends BaseEntityCollectionRequest<T, T5, T6>>,
+                            T8 extends BaseCollectionReferenceRequestBuilder<T, T3, T5, T6, T7>> extends BaseCollectionRequestBuilder<T, T3, T5, T6, T7> {
+    private final Class<T8> collWithRefRequestBuilderClass;
+    /**
+     * The request builder for this collection
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param referenceRequestBuilderClass the class for the request builder
+     * @param collectionWithReferencesRequestClass the class for the collection request
+     * @param collectionWithReferenceRequestBuilderClass the class for the collection request builder
+     */
+    public BaseCollectionWithReferencesRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+                                                    @Nonnull final Class<T3> referenceRequestBuilderClass,
+                                                    @Nonnull final Class<T7> collectionWithReferencesRequestClass,
+                                                    @Nonnull final Class<T8> collectionWithReferenceRequestBuilderClass) {
+        super(requestUrl, client, requestOptions, referenceRequestBuilderClass, collectionWithReferencesRequestClass);
+        this.collWithRefRequestBuilderClass = collectionWithReferenceRequestBuilderClass;
+    }
+
+    /**
+     * Gets a request builder to get the references to this collection
+     *
+     * @return a request builder to get the references to this collection
+     */
+    @Nullable
+    public T8 references() {
+        try {
+            return this.collWithRefRequestBuilderClass
+                    .getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                    .newInstance(getRequestUrl() + "/$ref", getClient(), getOptions());
+        } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
new file mode 100644
index 000000000..9a2c0410f
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
@@ -0,0 +1,103 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.net.URL;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.ICollectionResponse;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+
+/**
+ * A request against a collection bound function
+ *
+ * @param <T> the type of the object in the collection
+ * @param <T2> the response collection type
+ * @param <T3> the collection page type
+ */
+public abstract class BaseDeltaCollectionRequest<T, T2 extends ICollectionResponse<T>,
+                                            T3 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>> extends BaseFunctionCollectionRequest<T, T2, T3> {
+
+
+    /**
+     * Create the collection request
+     *
+     * @param requestUrl          the URL to make the request against
+     * @param client              the client which can issue the request
+     * @param options             the options for this request
+     * @param responseCollectionClass       the class for the response collection
+     * @param collectionPageClass the class for the collection page
+     * @param collectionRequestBuilderClass the class for the collection request builder
+     */
+    public BaseDeltaCollectionRequest(@Nonnull final String requestUrl,
+                                 @Nonnull final IBaseClient client,
+                                 @Nullable final List<? extends Option> options,
+                                 @Nonnull final Class<T2> responseCollectionClass,
+                                 @Nonnull final Class<T3> collectionPageClass,
+                                 @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
+        super(requestUrl, client, options, responseCollectionClass, collectionPageClass, collectionRequestBuilderClass);
+    }
+
+    /**
+     * Adds the delta token query string value for the request
+     * @param value - The token
+     * @param optionKey - the key to use for the query string parameter
+     */
+    protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final String optionKey) {
+        addQueryOption(new QueryOption(optionKey, value));
+    }
+
+    /**
+     * Matches 3 formats of delta links
+     * ?$deltatoken=thetoken (most services)
+     * ?token=thetoken (onedrive)
+     * delta(token='thetoken') (formal OData function usage)
+     */
+    private static Pattern pattern = Pattern.compile("(?i)(?>\\$?delta)?token=['\"]?([\\w-\\.]+)");
+    /**
+     * Gets the delta token from the delta link provided by the previous response
+     * @param deltaLink the delta link provided by the previous request
+     * @return the delta token
+     */
+    @Nonnull
+    protected String getDeltaTokenFromLink(@Nonnull final String deltaLink) {
+        if(deltaLink != null) {
+            final Matcher matcher = pattern.matcher(deltaLink);
+            if(matcher.matches()) {
+                return matcher.group(1);
+            }
+        }
+        return  "";
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
new file mode 100644
index 000000000..9ddf8a573
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
@@ -0,0 +1,98 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.net.URL;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.ICollectionResponse;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.options.Option;
+
+/**
+ * A request against a collection
+ *
+ * @param <T> the type of the object in the collection
+ * @param <T2> the response collection type
+ * @param <T3> the collection page type
+ */
+public abstract class BaseEntityCollectionRequest<T, T2 extends ICollectionResponse<T>,
+                                            T3 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>> extends BaseCollectionRequest<T, T2, T3> {
+
+
+    /**
+     * Create the collection request
+     *
+     * @param requestUrl          the URL to make the request against
+     * @param client              the client which can issue the request
+     * @param options             the options for this request
+     * @param responseCollectionClass       the class for the response collection
+     * @param collectionPageClass the class for the collection page
+     * @param collectionRequestBuilderClass the class for the collection request builder
+     */
+    public BaseEntityCollectionRequest(@Nonnull final String requestUrl,
+                                 @Nonnull final IBaseClient client,
+                                 @Nullable final List<? extends Option> options,
+                                 @Nonnull final Class<T2> responseCollectionClass,
+                                 @Nonnull final Class<T3> collectionPageClass,
+                                 @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
+        super(requestUrl, client, options, responseCollectionClass, collectionPageClass, collectionRequestBuilderClass);
+    }
+
+    /**
+     * Gets the collection of items
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T3> futureGet() {
+        return futureSend().thenApply(r -> buildFromResponse(r));
+    }
+    /**
+     * Gets the collection of items
+     *
+     * @return the collection page
+     */
+    @Nullable
+    public T3 get() throws ClientException {
+        return buildFromResponse(send());
+    }
+    /**
+     * Posts this request
+     *
+     * @param serializedObject the object to serialize as the body
+     * @param <BodyType>       the type of the serialized body, some times Action use different body than collection item
+     * @return the response object
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected <BodyType> T2 post(@Nonnull final BodyType serializedObject) throws ClientException {
+        getBaseRequest().setHttpMethod(HttpMethod.POST);
+        return getBaseRequest().getClient().getHttpProvider().send(this, responseCollectionClass, serializedObject);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
new file mode 100644
index 000000000..24dbfe5c7
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
@@ -0,0 +1,86 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.net.URL;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.ICollectionResponse;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.options.Option;
+
+/**
+ * A request against a collection bound function
+ *
+ * @param <T> the type of the object in the collection
+ * @param <T2> the response collection type
+ * @param <T3> the collection page type
+ */
+public abstract class BaseFunctionCollectionRequest<T, T2 extends ICollectionResponse<T>,
+                                            T3 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>> extends BaseCollectionRequest<T, T2, T3> {
+
+
+    /**
+     * Create the collection request
+     *
+     * @param requestUrl          the URL to make the request against
+     * @param client              the client which can issue the request
+     * @param options             the options for this request
+     * @param responseCollectionClass       the class for the response collection
+     * @param collectionPageClass the class for the collection page
+     * @param collectionRequestBuilderClass the class for the collection request builder
+     */
+    public BaseFunctionCollectionRequest(@Nonnull final String requestUrl,
+                                 @Nonnull final IBaseClient client,
+                                 @Nullable final List<? extends Option> options,
+                                 @Nonnull final Class<T2> responseCollectionClass,
+                                 @Nonnull final Class<T3> collectionPageClass,
+                                 @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
+        super(requestUrl, client, options, responseCollectionClass, collectionPageClass, collectionRequestBuilderClass);
+    }
+
+    /**
+     * Gets the collection of items
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T3> futureGet() {
+        return futureSend().thenApply(r -> buildFromResponse(r));
+    }
+
+    /**
+     * Gets the collection of items
+     *
+     * @return the collection page
+     */
+    @Nullable
+    public T3 get() throws ClientException {
+        return buildFromResponse(send());
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java
new file mode 100644
index 000000000..68b856fc3
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java
@@ -0,0 +1,50 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.Option;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The base method request builder class
+ */
+public class BaseFunctionCollectionRequestBuilder<T, T2 extends BaseRequestBuilder<T>,
+                                                    T3 extends ICollectionResponse<T>,
+                                                    T4 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>,
+                                                    T5 extends BaseCollectionRequest<T, T3, T4>> extends BaseCollectionRequestBuilder<T, T2, T3, T4, T5> {
+
+    /**
+     * The {@link FunctionOption}s to add to this request
+     */
+    @Nonnull
+    protected List<FunctionOption> functionOptions = new ArrayList<>();
+
+    /**
+     * Constructs a new {@link BaseFunctionCollectionRequestBuilder}
+     *
+     * @param requestUrl the URL for the request
+     * @param client     the {@link IBaseClient} for handling requests
+     * @param options    {@link List} of {@link Option}s to add to this request
+     * @param requestBuilderClass the class for the request builder
+     * @param collectionRequestClass the class for the collection request
+     */
+    public BaseFunctionCollectionRequestBuilder(
+            @Nonnull final String requestUrl,
+            @Nonnull final IBaseClient client,
+            @Nullable final List<? extends Option> options,
+            @Nonnull final Class<T2> requestBuilderClass,
+            @Nonnull final Class<T5> collectionRequestClass
+    ) {
+        super(requestUrl, client, options, requestBuilderClass, collectionRequestClass);
+    }
+
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java
new file mode 100644
index 000000000..7de5a7e65
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java
@@ -0,0 +1,44 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.Option;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The base method request builder class
+ */
+public class BaseFunctionRequestBuilder<T> extends BaseRequestBuilder<T> {
+
+    /**
+     * The {@link FunctionOption}s to add to this request
+     */
+    @Nonnull
+    protected List<FunctionOption> functionOptions = new ArrayList<>();
+
+    /**
+     * Constructs a new {@link BaseFunctionRequestBuilder}
+     *
+     * @param requestUrl the URL for the request
+     * @param client     the {@link IBaseClient} for handling requests
+     * @param options    {@link List} of {@link Option}s to add to this request
+     */
+    public BaseFunctionRequestBuilder(
+            @Nonnull final String requestUrl,
+            @Nonnull final IBaseClient client,
+            @Nullable final List<? extends Option> options
+    ) {
+        super(requestUrl, client, options);
+    }
+
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
new file mode 100644
index 000000000..d353213fd
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
@@ -0,0 +1,70 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.Option;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An HTTP request.
+ *
+ * @param <T> the response class
+ */
+public abstract class BaseReferenceRequest<T> extends BaseRequest<T> {
+
+    /**
+     * The request for reference
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param entityType     the class for the entity
+     */
+    public BaseReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> entityType) {
+        super(requestUrl, client, requestOptions, entityType);
+    }
+
+    /**
+     * Deletes the entity and invokes the callback
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futureDelete() {
+        return futureSend(HttpMethod.DELETE, null);
+    }
+
+    /**
+     * Deletes the entity
+     * @return the result from the API response, if any
+     */
+    @Nullable
+    public T delete() throws ClientException {
+       return send(HttpMethod.DELETE, null);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
new file mode 100644
index 000000000..768a49cd1
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
@@ -0,0 +1,80 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.Option;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A request builder
+ */
+public abstract class BaseReferenceRequestBuilder<T, T2 extends BaseReferenceRequest<T>> extends BaseRequestBuilder<T> {
+
+    private Class<T2> refRequestClass;
+
+    /**
+     * The request builder for the User
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param referenceRequestClass the class to use to build the request
+     */
+    public BaseReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T2> referenceRequestClass) {
+        super(requestUrl, client, requestOptions);
+        this.refRequestClass = referenceRequestClass;
+    }
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return The ReferenceRequest instance
+     */
+    @Nullable
+    public T2 buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
+    }
+
+    /**
+     * Creates the request with specific requestOptions instead of the existing requestOptions
+     *
+     * @param requestOptions the options for this request
+     * @return the ReferenceRequest instance
+     */
+    @Nullable
+    public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
+        try {
+            return refRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                                .newInstance(getRequestUrl(), getClient(), requestOptions);
+        } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+		}
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
new file mode 100644
index 000000000..7c619f994
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -0,0 +1,597 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import okhttp3.HttpUrl;
+import okhttp3.Request;
+import okhttp3.HttpUrl.Builder;
+
+import com.microsoft.graph.content.MSBatchRequestContent;
+import com.microsoft.graph.content.MSBatchRequestStep;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
+import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.Constants;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An HTTP request.
+ *
+ * @param <T> the response class
+ */
+public abstract class BaseRequest<T> implements IHttpRequest {
+
+    /**
+     * The request stats header name
+     */
+    private static final String REQUEST_STATS_HEADER_NAME = "SdkVersion";
+
+    /**
+     * The request stats header value format string
+     */
+    public static final String REQUEST_STATS_HEADER_VALUE_FORMAT_STRING = "graph-java/v%s";
+
+    /**
+     * The HTTP method for this request
+     */
+    private HttpMethod method;
+
+    /**
+     * The URL for this request
+     */
+    private final String requestUrl;
+
+    /**
+     * The backing client for this request
+     */
+    private final IBaseClient client;
+
+    /**
+     * The header options for this request
+     */
+    private final List<HeaderOption> headersOptions;
+
+    /**
+     * The query options for this request
+     */
+    protected final List<QueryOption> queryOptions;
+
+    /**
+     * The function options for this request
+     */
+    protected final List<FunctionOption> functionOptions;
+
+    /**
+     * The class for the response
+     */
+    private final Class<? extends T> responseClass;
+
+    /**
+     * Value to pass to setUseCaches in connection
+     */
+    private boolean useCaches;
+
+    /**
+     * MaxRedirects of every request
+     */
+    private int maxRedirects = RedirectOptions.DEFAULT_MAX_REDIRECTS;
+
+    /**
+     * ShouldRedirect callback for every request
+     */
+    private IShouldRedirect shouldRedirect = RedirectOptions.DEFAULT_SHOULD_REDIRECT;
+
+    /**
+     * Max redirects for every request
+     */
+    private int maxRetries = RetryOptions.DEFAULT_MAX_RETRIES;
+
+    /**
+     * Delay in seconds for every request
+     */
+    private long delay = RetryOptions.DEFAULT_DELAY;
+
+    /**
+     * Callback before doing a retry
+     */
+    private IShouldRetry shouldRetry = RetryOptions.DEFAULT_SHOULD_RETRY;
+
+    /**
+     * Creates the request
+     *
+     * @param requestUrl    the URL to make the request against
+     * @param client        the client which can issue the request
+     * @param options       the options for this request
+     * @param responseClass the class for the response
+     */
+    public BaseRequest(@Nonnull final String requestUrl,
+                       @Nonnull final IBaseClient client,
+                       @Nullable final List<? extends Option> options,
+                       @Nonnull final Class<? extends T> responseClass) {
+        this.requestUrl = requestUrl;
+        this.client = client;
+        this.responseClass = responseClass;
+
+        headersOptions = new ArrayList<>();
+        queryOptions = new ArrayList<>();
+        functionOptions = new ArrayList<>();
+
+        if (options != null) {
+            for (final Option option : options) {
+                if (option instanceof HeaderOption) {
+                    headersOptions.add((HeaderOption) option);
+                }
+                if (option instanceof QueryOption) {
+                    queryOptions.add((QueryOption) option);
+                }
+
+                if (option instanceof FunctionOption) {
+                    functionOptions.add((FunctionOption) option);
+                }
+            }
+        }
+        final HeaderOption requestStatsHeader = new HeaderOption(REQUEST_STATS_HEADER_NAME,
+                String.format(REQUEST_STATS_HEADER_VALUE_FORMAT_STRING, Constants.VERSION_NAME));
+        headersOptions.add(requestStatsHeader);
+    }
+
+    /**
+     * Gets the request URL
+     *
+     * @return the request URL
+     */
+    @Override
+    @Nullable
+    public URL getRequestUrl() {
+        String requestUrl = addFunctionParameters();
+        final Builder uriBuilder = HttpUrl.parse(requestUrl).newBuilder();
+
+        for (final QueryOption option : queryOptions) {
+        	uriBuilder.addQueryParameter(option.getName(), option.getValue().toString());
+        }
+
+        try {
+            return new URL(uriBuilder.build().toString());
+        } catch (final MalformedURLException e) {
+        	if (this instanceof CustomRequest) {
+        		this.getClient().getLogger().logError("Invalid custom URL: " + uriBuilder.toString(), e);
+        	} else {
+        		throw new ClientException("Invalid URL: " + uriBuilder.toString(), e);
+        	}
+        }
+		return null;
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Override
+    @Nullable
+    public Request getHttpRequest() throws ClientException {
+        return getHttpRequest(null);
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response
+     * @return the Request object to be executed
+     */
+    @Override
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+        return client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject);
+    }
+
+    private String addFunctionParameters() {
+        final StringBuilder requestUrl = new StringBuilder(this.requestUrl);
+
+        if (!getFunctionOptions().isEmpty()) {
+            requestUrl.append("(");
+
+            for (int i = 0; i < functionOptions.size(); i++) {
+                final FunctionOption option = functionOptions.get(i);
+                requestUrl.append(option.getName());
+                requestUrl.append("=");
+                if (option.getValue() != null) {
+                    if (option.getValue() instanceof String) {
+                        requestUrl.append("'" + option.getValue() + "'");
+                    } else {
+                        requestUrl.append(option.getValue());
+                    }
+                } else {
+                    requestUrl.append("null");
+                }
+
+                if (i + 1 < functionOptions.size()) {
+                    requestUrl.append(",");
+                }
+            }
+
+            requestUrl.append(")");
+        }
+        return requestUrl.toString();
+    }
+
+    /**
+     * Gets the HTTP method
+     *
+     * @return the HTTP method
+     */
+    @Override
+    @Nullable
+    public HttpMethod getHttpMethod() {
+        return method;
+    }
+
+    /**
+     * Gets the headers
+     *
+     * @return the headers
+     */
+    @Override
+    @Nullable
+    public List<HeaderOption> getHeaders() {
+        return headersOptions;
+    }
+
+    /**
+     * Adds a header to this request
+     *
+     * @param header the name of the header
+     * @param value  the value of the header
+     */
+    @Override
+    public void addHeader(@Nonnull final String header, @Nonnull final String value) {
+        headersOptions.add(new HeaderOption(header, value));
+    }
+
+    /**
+     * Sets useCaches parameter to cache the response
+     *
+     * @param useCaches the value of useCaches
+     */
+    @Override
+    public void setUseCaches(boolean useCaches) {
+        this.useCaches = useCaches;
+    }
+
+    /**
+     * Gets useCaches parameter
+     *
+     * @return the value of useCaches
+     */
+    @Override
+    public boolean getUseCaches() {
+        return useCaches;
+    }
+
+    /**
+     * Sends this request
+     *
+     * @param method           the HTTP method
+     * @param serializedObject the object to serialize as the body
+     * @param <T1>             the type of the serialized body
+     * @return a future with the result
+     */
+    @Nonnull
+    @SuppressWarnings("unchecked")
+    protected <T1> java.util.concurrent.CompletableFuture<T> futureSend(@Nonnull final HttpMethod method,
+                                 @Nullable final T1 serializedObject) {
+        this.method = method;
+        return (java.util.concurrent.CompletableFuture<T>) client.getHttpProvider().futureSend(this, responseClass, serializedObject);
+    }
+
+    /**
+     * Sends this request
+     *
+     * @param method           the HTTP method
+     * @param serializedObject the object to serialize as the body
+     * @param <T1>             the type of the serialized body
+     * @return the response object
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected <T1> T send(@Nullable final HttpMethod method,
+                               @Nullable final T1 serializedObject) throws ClientException {
+        this.method = method;
+        return client.getHttpProvider().send(this, responseClass, serializedObject);
+    }
+
+    /**
+     * Gets the query options for this request
+     *
+     * @return the query options for this request
+     */
+    @Nullable
+    public List<QueryOption> getQueryOptions() {
+        return queryOptions;
+    }
+
+    /**
+     * Gets the function options for this request
+     *
+     * @return the function options for this request
+     */
+    @Nullable
+    public List<FunctionOption> getFunctionOptions() {
+        return functionOptions;
+    }
+
+    /**
+     * Gets the full list of options for this request
+     *
+     * @return the full list of options for this request
+     */
+    @Nullable
+    public List<Option> getOptions() {
+        final LinkedList<Option> list = new LinkedList<>();
+        list.addAll(headersOptions);
+        list.addAll(queryOptions);
+        list.addAll(functionOptions);
+        return Collections.unmodifiableList(list);
+    }
+
+    /**
+     * Adds a query option
+     *
+     * @param option the query option to add
+     */
+    public void addQueryOption(@Nonnull final QueryOption option) {
+        getQueryOptions().add(option);
+    }
+
+    /**
+     * Adds a function option
+     *
+     * @param option the function option to add
+     */
+    public void addFunctionOption(@Nonnull final FunctionOption option) {
+        getFunctionOptions().add(option);
+    }
+
+    /**
+     * Sets the expand clause for the request
+     *
+     * @param value the expand clause
+     */
+    protected void addExpandOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$expand", value));
+    }
+
+    /**
+     * Sets the filter clause for the request
+     *
+     * @param value the filter clause
+     */
+    protected void addFilterOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$filter", value));
+    }
+
+    /**
+     * Sets the order by clause for the request
+     *
+     * @param value the order by clause
+     */
+    protected void addOrderByOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$orderby", value));
+    }
+
+    /**
+     * Sets the select clause for the request
+     *
+     * @param value the select clause
+     */
+    protected void addSelectOption(@Nonnull final String value) {
+        addQueryOption(new QueryOption("$select", value));
+    }
+
+    /**
+     * Sets the top value for the request
+     *
+     * @param value the max number of items to return
+     */
+    protected void addTopOption(final int value) {
+        addQueryOption(new QueryOption("$top", String.valueOf(value)));
+    }
+
+    /**
+     * Sets the skip value for the request
+     *
+     * @param value of the number of items to skip
+     */
+    protected void addSkipOption(final int value) {
+        addQueryOption(new QueryOption("$skip", String.valueOf(value)));
+    }
+
+
+    /**
+     * Add Skip token for pagination
+     * @param skipToken - Token for pagination
+     */
+    protected void addSkipTokenOption(@Nonnull final String skipToken) {
+    	addQueryOption(new QueryOption("$skiptoken", skipToken));
+    }
+
+    /**
+     * Adds the count query string value for the request
+     * @param value - Wheter to return the count or not
+     */
+    protected void addCountOption(final boolean value) {
+        addQueryOption(new QueryOption("$count", String.valueOf(value)));
+    }
+
+    /**
+     * Sets the HTTP method
+     *
+     * @param httpMethod the HTTP method
+     */
+    public void setHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        method = httpMethod;
+    }
+
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    @Nullable
+    public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        method = httpMethod;
+        return this;
+    }
+
+    /**
+     * Gets the client
+     *
+     * @return the client
+     */
+    @Nonnull
+    public IBaseClient getClient() {
+        return client;
+    }
+
+    /**
+     * Gets the response type
+     *
+     * @return the response type
+     */
+    @Nullable
+    public Class<? extends T> getResponseType() {
+        return responseClass;
+    }
+
+	   /**
+     * Sets the max redirects
+     *
+     * @param maxRedirects Max redirects that a request can take
+     */
+    public void setMaxRedirects(int maxRedirects) {
+    	this.maxRedirects = maxRedirects;
+    }
+
+    /**
+     * Gets the max redirects
+     *
+     * @return Max redirects that a request can take
+     */
+    public int getMaxRedirects() {
+    	return maxRedirects;
+    }
+
+    /**
+     * Sets the should redirect callback
+     *
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    public void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect) {
+    	this.shouldRedirect = shouldRedirect;
+    }
+
+    /**
+     * Gets the should redirect callback
+     *
+     * @return Callback which is called before redirect
+     */
+    @Nullable
+    public IShouldRedirect getShouldRedirect() {
+    	return shouldRedirect;
+    }
+
+    /**
+     * Sets the should retry callback
+     *
+     * @param shouldretry The callback called before retry
+     */
+    public void setShouldRetry(@Nonnull IShouldRetry shouldretry) {
+    	this.shouldRetry = shouldretry;
+    }
+
+    /**
+     * Gets the should retry callback
+     *
+     * @return Callback called before retry
+     */
+    @Nullable
+    public IShouldRetry getShouldRetry() {
+    	return shouldRetry;
+    }
+
+    /**
+     * Sets the max retries
+     *
+     * @param maxRetries Max retries for a request
+     */
+    public void setMaxRetries(int maxRetries) {
+    	this.maxRetries = maxRetries;
+    }
+
+    /**
+     * Gets max retries
+     *
+     * @return Max retries for a request
+     */
+    public int getMaxRetries() {
+    	return maxRetries;
+    }
+
+    /**
+     * Sets the delay in seconds between retires
+     *
+     * @param delay Delay in seconds between retries
+     */
+    public void setDelay(long delay) {
+    	this.delay = delay;
+    }
+
+    /**
+     * Gets delay between retries
+     *
+     * @return Delay between retries in seconds
+     */
+    public long getDelay() {
+    	return delay;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
new file mode 100644
index 000000000..638ddae48
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
@@ -0,0 +1,131 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.Option;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Arrays;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A request builder
+ */
+public abstract class BaseRequestBuilder<T> implements IRequestBuilder {
+
+    /**
+     * The backing client for this request.
+     */
+    private final IBaseClient client;
+
+    /**
+     * The URL for this request
+     */
+    private final String requestUrl;
+
+    /**
+     * The options for this request
+     */
+    private final List<Option> options = new ArrayList<>();
+
+    /**
+     * Creates the request builder
+     *
+     * @param requestUrl the URL to make the request against
+     * @param client     the client which can issue the request
+     * @param options    the options for this request
+     */
+    public BaseRequestBuilder(
+            @Nonnull final String requestUrl,
+            @Nonnull final IBaseClient client,
+            @Nullable final List<? extends Option> options
+    ) {
+        this.requestUrl = requestUrl;
+        this.client = client;
+        if (options != null) {
+            this.options.addAll(options);
+        }
+    }
+
+    /**
+     * Gets the client
+     *
+     * @return the client
+     */
+    @Nullable
+    public IBaseClient getClient() {
+        return client;
+    }
+
+    /**
+     * Gets the request URL
+     *
+     * @return the request URL
+     */
+    @Nullable
+    public String getRequestUrl() {
+        return requestUrl;
+    }
+
+    /**
+     * Get the full list of options for this request
+     *
+     * @param requestOptions the options for this request
+     * @return the full list of options for this request
+     */
+    @Nonnull
+    public List<? extends Option> getOptions(@Nonnull final Option... requestOptions) {
+        return Collections.unmodifiableList(requestOptions != null && requestOptions.length > 0 ? 
+                Arrays.asList(requestOptions) 
+                : options);
+    }
+
+    /**
+     * Gets the request URL with an extra segment added to it
+     *
+     * @param  urlSegment the section to add
+     * @return the base URL for this request
+     */
+    @Nonnull
+    public String getRequestUrlWithAdditionalSegment(@Nonnull final String urlSegment) {
+        return requestUrl + "/" + urlSegment;
+    }
+
+    /**
+     * Gets the request URL with an odata parameter added to it
+     *
+     * @param  parameter the parameter to add
+     * @return the base URL for this request
+     */
+    @Nonnull
+    public String getRequestUrlWithAdditionalParameter(@Nonnull final String parameter) {
+        return requestUrl + "('" + parameter + "')";
+    }
+
+
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
new file mode 100644
index 000000000..a3ac816b6
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -0,0 +1,320 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
+import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
+
+import okhttp3.Request;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A request for a binary stream
+ *
+ * @param <T> the class of the response type
+ */
+public abstract class BaseStreamRequest<T> implements IHttpStreamRequest {
+
+    /**
+     * The base request for this collection request
+     */
+    private final BaseRequest<T> baseRequest;
+
+    /**
+     * Creates the stream request.
+     *
+     * @param requestUrl    the URL to make the request against
+     * @param client        the client which can issue the request
+     * @param options       the options for this request
+     * @param responseClass the class for the response
+     */
+    public BaseStreamRequest(@Nonnull final String requestUrl,
+                             @Nonnull final IBaseClient client,
+                             @Nullable final List<? extends Option> options,
+                             @Nonnull final Class<T> responseClass) {
+        baseRequest = new BaseRequest<T>(requestUrl, client, options, responseClass) {
+        };
+    }
+
+    /**
+     * Sends this request
+     *
+     * @return a future with the result
+     */
+    @Nonnull
+    protected java.util.concurrent.CompletableFuture<InputStream> futureSend() {
+        baseRequest.setHttpMethod(HttpMethod.GET);
+        return baseRequest.getClient().getHttpProvider().futureSend(this, InputStream.class, null);
+    }
+
+    /**
+     * Sends this request
+     *
+     * @return the stream that the caller needs to close
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected InputStream send() throws ClientException {
+        baseRequest.setHttpMethod(HttpMethod.GET);
+        return baseRequest.getClient().getHttpProvider().send(this, InputStream.class, null);
+    }
+
+    /**
+     * Sends this request
+     *
+     * @param fileContents the file to upload
+     * @return a future with the result
+     */
+    @SuppressWarnings("unchecked")
+    @Nonnull
+    protected java.util.concurrent.CompletableFuture<T> futureSend(@Nonnull final byte[] fileContents) {
+        baseRequest.setHttpMethod(HttpMethod.PUT);
+        return baseRequest.getClient().getHttpProvider().futureSend(this, (Class<T>) baseRequest.getResponseType(), fileContents);
+    }
+
+    /**
+     * Sends this request
+     *
+     * @param fileContents the file to upload
+     * @return             the stream that the caller needs to close
+     */
+    @Nullable
+    protected T send(@Nonnull final byte[] fileContents) {
+        baseRequest.setHttpMethod(HttpMethod.PUT);
+        return (T) baseRequest.getClient().getHttpProvider().send(this, baseRequest.getResponseType(), fileContents);
+    }
+
+    /**
+     * Gets the request URL
+     *
+     * @return the request URL
+     */
+    @Override
+    @Nullable
+    public URL getRequestUrl() {
+        return baseRequest.getRequestUrl();
+    }
+
+    /**
+     * Gets the HTTP method
+     *
+     * @return the HTTP method
+     */
+    @Override
+    @Nullable
+    public HttpMethod getHttpMethod() {
+        return baseRequest.getHttpMethod();
+    }
+
+    /**
+     * Adds a header to this request
+     *
+     * @param header the name of the header
+     * @param value  the value of the header
+     */
+    @Override
+    public void addHeader(@Nonnull final String header, @Nonnull final String value) {
+        baseRequest.addHeader(header, value);
+    }
+
+    /**
+     * Sets useCaches parameter to cache the response
+     *
+     * @param useCaches the value of useCaches
+     */
+    @Override
+    public void setUseCaches(boolean useCaches) {
+        baseRequest.setUseCaches(useCaches);
+    }
+
+    /**
+     * Gets useCaches parameter
+     *
+     * @return the value of useCaches
+     */
+    @Override
+    public boolean getUseCaches() {
+        return baseRequest.getUseCaches();
+    }
+
+    /**
+     * Gets the headers
+     *
+     * @return the headers
+     */
+    @Override
+    @Nullable
+    public List<HeaderOption> getHeaders() {
+        return baseRequest.getHeaders();
+    }
+
+    /**
+     * Gets the query options for this request
+     *
+     * @return the query options for this request
+     */
+    @Override
+    @Nullable
+    public List<Option> getOptions() {
+        return baseRequest.getOptions();
+    }
+
+    /**
+     * Sets the max redirects
+     *
+     * @param maxRedirects Max redirects that a request can take
+     */
+    public void setMaxRedirects(int maxRedirects) {
+    	baseRequest.setMaxRedirects(maxRedirects);
+    }
+
+    /**
+     * Gets the max redirects
+     *
+     * @return Max redirects that a request can take
+     */
+    public int getMaxRedirects() {
+    	return baseRequest.getMaxRedirects();
+    }
+
+    /**
+     * Sets the should redirect callback
+     *
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    public void setShouldRedirect(@Nonnull final IShouldRedirect shouldRedirect) {
+    	baseRequest.setShouldRedirect(shouldRedirect);
+    }
+
+    /**
+     * Gets the should redirect callback
+     *
+     * @return Callback which is called before redirect
+     */
+    @Nullable
+    public IShouldRedirect getShouldRedirect() {
+    	return baseRequest.getShouldRedirect();
+    }
+
+    /**
+     * Sets the should retry callback
+     *
+     * @param shouldretry The callback called before retry
+     */
+    public void setShouldRetry(@Nonnull final IShouldRetry shouldretry) {
+    	baseRequest.setShouldRetry(shouldretry);
+    }
+
+    /**
+     * Gets the should retry callback
+     *
+     * @return Callback called before retry
+     */
+    @Nullable
+    public IShouldRetry getShouldRetry() {
+    	return baseRequest.getShouldRetry();
+    }
+
+    /**
+     * Sets the max retries
+     *
+     * @param maxRetries Max retries for a request
+     */
+    public void setMaxRetries(int maxRetries) {
+    	baseRequest.setMaxRetries(maxRetries);
+    }
+
+    /**
+     * Gets max retries
+     *
+     * @return Max retries for a request
+     */
+    public int getMaxRetries() {
+    	return baseRequest.getMaxRetries();
+    }
+
+    /**
+     * Sets the delay in seconds between retires
+     *
+     * @param delay Delay in seconds between retries
+     */
+    public void setDelay(long delay) {
+    	baseRequest.setDelay(delay);
+    }
+
+    /**
+     * Gets delay between retries
+     *
+     * @return Delay between retries in seconds
+     */
+    public long getDelay() {
+    	return baseRequest.getDelay();
+    }
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    @Override
+    @Nullable
+    public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        baseRequest.setHttpMethod(httpMethod);
+        return this;
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Override
+    @Nullable
+    public Request getHttpRequest() throws ClientException {
+        return baseRequest.getHttpRequest();
+    }
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response
+     * @return the Request object to be executed
+     */
+    @Override
+    @Nullable
+    public <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+        return baseRequest.getHttpRequest(serializedObject);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
new file mode 100644
index 000000000..bece62dcb
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
@@ -0,0 +1,107 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.net.URL;
+import java.lang.NoSuchFieldException;
+import java.lang.IllegalAccessException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.ICollectionResponse;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.options.Option;
+
+/**
+ * A request against a collection bound action
+ *
+ * @param <T> the type of the object in the collection
+ * @param <T2> the response collection type
+ * @param <T3> the collection page type
+ */
+public abstract class BaseVoidActionCollectionRequest<T, T2 extends ICollectionResponse<T>,
+                                            T3 extends BaseCollectionPage<T, ? extends BaseRequestBuilder<T>>> extends BaseCollectionRequest<T, T2, T3> {
+
+
+    /**
+     * Create the collection request
+     *
+     * @param requestUrl          the URL to make the request against
+     * @param client              the client which can issue the request
+     * @param options             the options for this request
+     * @param responseCollectionClass       the class for the response collection
+     * @param collectionPageClass the class for the collection page
+     * @param collectionRequestBuilderClass the class for the collection request builder
+     */
+    public BaseVoidActionCollectionRequest(@Nonnull final String requestUrl,
+                                 @Nonnull final IBaseClient client,
+                                 @Nullable final List<? extends Option> options,
+                                 @Nonnull final Class<T2> responseCollectionClass,
+                                 @Nonnull final Class<T3> collectionPageClass,
+                                 @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
+        super(requestUrl, client, options, responseCollectionClass, collectionPageClass, collectionRequestBuilderClass);
+    }
+
+    /**
+     * Invokes the method and calls the callback with the resulting collection of objects
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<Void> futurePost() {
+        Object bodyToSend = null;
+        try {
+            bodyToSend = this.getClass().getField("body").get(this);
+        } catch (NoSuchFieldException | IllegalAccessException ex) {
+            // this action doesn't body arguments, expected, no-op
+        }
+        return getBaseRequest()
+                    .getClient()
+                    .getHttpProvider()
+                    .futureSend(this,
+                        Void.class,
+                        bodyToSend);
+    }
+    /**
+     * Invokes the method
+     */
+    @Nullable
+    public Void post() throws ClientException {
+        Object bodyToSend = null;
+        try {
+            bodyToSend = this.getClass().getField("body").get(this);
+        } catch (NoSuchFieldException | IllegalAccessException ex) {
+            // this action doesn't body arguments, expected, no-op
+        }
+        getBaseRequest()
+                    .getClient()
+                    .getHttpProvider()
+                    .send(this,
+                        Void.class,
+                        bodyToSend);
+        return null;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
new file mode 100644
index 000000000..921ff9db7
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
@@ -0,0 +1,138 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An HTTP request.
+ *
+ * @param <T> the response class
+ */
+public abstract class BaseWithReferenceRequest<T> extends BaseRequest<T> {
+
+    /**
+     * The request for the entity
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param entityClass     the class for the entity
+     */
+    public BaseWithReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+                                    @Nonnull final Class<T> entityClass) {
+        super(requestUrl, client, requestOptions, entityClass);
+    }
+
+    /**
+     * Creates a new entity and invokes the callback with the result
+     *
+     * @param payload paylod to send to the service
+     * @param newEntity entity to return
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futurePost(@Nullable final T newEntity, @Nonnull final IJsonBackedObject payload) {
+        return futureSend(HttpMethod.POST, payload);
+    }
+
+    /**
+     * Creates a new entity and invokes the callback with the result
+     *
+     * @param payload paylod to send to the service
+     * @param newEntity entity to return
+     * @return the entity once request is executed
+     */
+    @Nullable
+    public T post(@Nonnull final T newEntity, @Nonnull final IJsonBackedObject payload) throws ClientException {
+        final T response = send(HttpMethod.POST, payload);
+        if (response != null){
+            return newEntity;
+        }
+        return null;
+    }
+
+    /**
+     * Gets the entity an invokes the callback with it
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futureGet() {
+        return futureSend(HttpMethod.GET, null);
+    }
+
+    /**
+     * Gets the entity
+     * @return the obtained entity
+     */
+    @Nullable
+    public T get() throws ClientException {
+       return send(HttpMethod.GET, null);
+    }
+
+    /**
+     * Deletes the entity and invokes the callback
+     * @return a future with the result
+     */
+    @Nonnull
+	public java.util.concurrent.CompletableFuture<T> futureDelete() {
+		return futureSend(HttpMethod.DELETE, null);
+	}
+
+    /**
+     * Deletes the entity
+     */
+	public void delete() throws ClientException {
+		send(HttpMethod.DELETE, null);
+	}
+
+    /**
+     * Updates the entity and invokes the callback
+     *
+     * @param sourceObject object to update
+     * @return a future with the result
+     */
+    @Nonnull
+	public java.util.concurrent.CompletableFuture<T> futurePatch(@Nonnull final T sourceObject) {
+		return futureSend(HttpMethod.PATCH, sourceObject);
+	}
+
+    /**
+     * Updates the entity
+     *
+     * @param sourceObject object to update
+     * @return the udpated entity
+     */
+    @Nullable
+	public T patch(@Nonnull final T sourceObject) throws ClientException {
+		return send(HttpMethod.PATCH, sourceObject);
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
new file mode 100644
index 000000000..a2661564e
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
@@ -0,0 +1,101 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.Option;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A request builder
+ */
+public abstract class BaseWithReferenceRequestBuilder<T, T2 extends BaseWithReferenceRequest<T>,
+                    T3 extends BaseReferenceRequestBuilder<T, ? extends BaseReferenceRequest<T>>> extends BaseRequestBuilder<T> {
+
+    private Class<T2> wReferenceRequestClass;
+    private Class<T3> refRequestBuilderClass;
+
+    /**
+     * The request builder for the User
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param withReferenceRequestClass the class for the request
+     * @param referenceRequestBuilderClass the class for the request builder
+     */
+    public BaseWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+                                            @Nonnull final Class<T2> withReferenceRequestClass,
+                                            @Nonnull final Class<T3> referenceRequestBuilderClass) {
+        super(requestUrl, client, requestOptions);
+        this.wReferenceRequestClass = withReferenceRequestClass;
+        this.refRequestBuilderClass = referenceRequestBuilderClass;
+    }
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the ReferenceRequest instance
+     */
+    @Nullable
+    public T2 buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
+    }
+
+    /**
+     * Creates the request with specific options instead of the existing options
+	 *
+     * @param requestOptions the options for this request
+     * @return the ReferenceRequest instance
+     */
+    @Nullable
+    public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
+        try {
+            return wReferenceRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                                .newInstance(getRequestUrl(), getClient(), requestOptions);
+        } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+		}
+    }
+
+    /**
+     * Creates a request builder to get the reference to the entity
+     * 
+     * @return the request builder
+     */
+    @Nullable
+    public T3 reference(){
+        try {
+            return refRequestBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
+                                .newInstance(getRequestUrl() + "/$ref", getClient(), getOptions());
+        } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
+            return null;
+		}
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpCallbackFutureWrapper.java b/src/main/java/com/microsoft/graph/http/CoreHttpCallbackFutureWrapper.java
new file mode 100644
index 000000000..1bb930411
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpCallbackFutureWrapper.java
@@ -0,0 +1,26 @@
+package com.microsoft.graph.http;
+
+import java.io.IOException;
+
+import java.util.concurrent.CompletableFuture;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Response;
+
+/**
+ * Wraps the HTTP execution in a future, not public by intention
+ */
+class CoreHttpCallbackFutureWrapper implements Callback {
+    final CompletableFuture<Response> future = new CompletableFuture<>();
+	@Override
+	public void onFailure(Call arg0, IOException arg1) {
+		future.completeExceptionally(arg1);
+	}
+
+	@Override
+	public void onResponse(Call arg0, Response arg1) throws IOException {
+		future.complete(arg1);
+	}
+
+}
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
new file mode 100644
index 000000000..e975a02b2
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -0,0 +1,605 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.Constants;
+import com.microsoft.graph.httpcore.HttpClients;
+import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
+import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.ISerializer;
+
+import okhttp3.Headers;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okio.BufferedSink;
+
+/**
+ * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
+ */
+public class CoreHttpProvider implements IHttpProvider {
+	private final static HttpResponseHeadersHelper responseHeadersHelper = new HttpResponseHeadersHelper();
+	/**
+	 * The serializer
+	 */
+	private final ISerializer serializer;
+
+	/**
+	 * The logger
+	 */
+	private final ILogger logger;
+
+	/**
+	 * The OkHttpClient that handles all requests
+	 */
+    private OkHttpClient corehttpClient;
+
+	/**
+	 * Creates the CoreHttpProvider
+	 *
+	 * @param serializer             the serializer
+	 * @param logger                 the logger for diagnostic information
+	 * @param httpClient             the client to send http requests with
+	 */
+	public CoreHttpProvider(@Nonnull final ISerializer serializer,
+			@Nonnull final ILogger logger,
+			@Nullable final OkHttpClient httpClient) {
+		if (httpClient == null) {
+			throw new NullPointerException("httpClient");
+		} else if(serializer == null) {
+			throw new NullPointerException("serializer");
+		} else if(logger == null) {
+			throw new NullPointerException("logger");
+		} else {
+			this.serializer = serializer;
+			this.logger = logger;
+			this.corehttpClient = httpClient;
+        }
+	}
+
+	/**
+	 * Gets the serializer for this HTTP provider
+	 *
+	 * @return the serializer for this provider
+	 */
+	@Override
+	@Nullable
+	public ISerializer getSerializer() {
+		return serializer;
+	}
+
+	/**
+	 * Sends the HTTP request asynchronously
+	 *
+	 * @param request      the request description
+	 * @param serializable the object to send to the service in the body of the request
+	 * @param <Result>     the type of the response object
+	 * @param <Body>       the type of the object to send to the service in the body of the request
+	 * @return a future with the result
+	 */
+	@Override
+	@Nullable
+	public <Result, Body> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+			@Nonnull final Class<Result> resultClass,
+			@Nullable final Body serializable) {
+		return futureSend(request,
+							resultClass,
+							serializable,
+							null);
+    }
+    /**
+     * Sends the HTTP request
+     *
+     * @param request           the request description
+     * @param resultClass       the class of the response from the service
+     * @param serializable      the object to send to the service in the body of the request
+     * @param handler           the handler for stateful response
+     * @param <Result>          the expected return type return
+     * @param <BodyType>        the type of the object to send to the service in the body of the request
+     * @param <DeserializeType> the type of the HTTP response object
+     * @return                  a future with the result
+     * @throws ClientException  this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+                                                    @Nonnull final Class<Result> resultClass,
+                                                    @Nullable final BodyType serializable,
+                                                    @Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler)
+            throws ClientException {
+        return sendFutureRequestInternal(request,
+                resultClass,
+                serializable,
+                handler);
+    }
+
+	/**
+	 * Sends the HTTP request
+	 *
+	 * @param request      the request description
+	 * @param resultClass  the class of the response from the service
+	 * @param serializable the object to send to the service in the body of the request
+	 * @param <Result>     the type of the response object
+	 * @param <Body>       the type of the object to send to the service in the body of the request
+	 * @return             the result from the request
+	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
+	 */
+	@Override
+	@Nullable
+	public <Result, Body> Result send(@Nonnull final IHttpRequest request,
+			@Nonnull final Class<Result> resultClass,
+			@Nullable final Body serializable)
+					throws ClientException {
+		return send(request, resultClass, serializable, null);
+	}
+
+	/**
+	 * Sends the HTTP request
+	 *
+	 * @param request           the request description
+	 * @param resultClass       the class of the response from the service
+	 * @param serializable      the object to send to the service in the body of the request
+	 * @param handler           the handler for stateful response
+	 * @param <Result>          the type of the response object
+	 * @param <Body>            the type of the object to send to the service in the body of the request
+	 * @param <DeserializeType> the response handler for stateful response
+	 * @return                  the result from the request
+	 * @throws ClientException this exception occurs if the request was unable to complete for any reason
+	 */
+    @Nullable
+	public <Result, Body, DeserializeType> Result send(@Nonnull final IHttpRequest request,
+			@Nonnull final Class<Result> resultClass,
+			@Nullable final Body serializable,
+			@Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler) throws ClientException {
+            return sendRequestInternal(request, resultClass, serializable, handler);
+	}
+	/**
+	 * Sends the HTTP request
+	 *
+	 * @param request           the request description
+	 * @param resultClass       the class of the response from the service
+	 * @param serializable      the object to send to the service in the body of the request
+	 * @param <Result>          the type of the response object
+	 * @param <Body>            the type of the object to send to the service in the body of the request
+	 * @return                  the result from the request
+	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
+	 */
+	@Nullable
+	public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request,
+			@Nonnull final Class<Result> resultClass,
+			@Nullable final Body serializable) throws ClientException {
+		final int defaultBufferSize = 4096;
+
+		final URL requestUrl = request.getRequestUrl();
+		logger.logDebug("Starting to send request, URL " + requestUrl.toString());
+
+		// Request level middleware options
+		final RedirectOptions redirectOptions = request.getMaxRedirects() <= 0 ? null : new RedirectOptions(request.getMaxRedirects(), request.getShouldRedirect());
+		final RetryOptions retryOptions = request.getShouldRetry() == null ? null : new RetryOptions(request.getShouldRetry(), request.getMaxRetries(), request.getDelay());
+
+		final Request coreHttpRequest = convertIHttpRequestToOkHttpRequest(request);
+		Request.Builder corehttpRequestBuilder = coreHttpRequest
+				.newBuilder();
+		if(redirectOptions != null) {
+			corehttpRequestBuilder = corehttpRequestBuilder.tag(RedirectOptions.class, redirectOptions);
+		}
+		if(retryOptions != null) {
+			corehttpRequestBuilder = corehttpRequestBuilder.tag(RetryOptions.class, retryOptions);
+		}
+
+		String contenttype = null;
+
+		logger.logDebug("Request Method " + request.getHttpMethod().toString());
+		final List<HeaderOption> requestHeaders = request.getHeaders();
+
+		for(HeaderOption headerOption : requestHeaders) {
+			if(headerOption.getName().equalsIgnoreCase(Constants.CONTENT_TYPE_HEADER_NAME)) {
+				contenttype = headerOption.getValue().toString();
+				break;
+			}
+		}
+
+		final byte[] bytesToWrite;
+		corehttpRequestBuilder.addHeader("Accept", "*/*");
+		if (serializable == null) {
+			// Send an empty body through with a POST request
+			// This ensures that the Content-Length header is properly set
+			if (request.getHttpMethod() == HttpMethod.POST) {
+				bytesToWrite = new byte[0];
+				if(contenttype == null) {
+					contenttype = Constants.BINARY_CONTENT_TYPE;
+				}
+			}
+			else {
+				bytesToWrite = null;
+			}
+		} else if (serializable instanceof byte[]) {
+			logger.logDebug("Sending byte[] as request body");
+			bytesToWrite = (byte[]) serializable;
+
+			// If the user hasn't specified a Content-Type for the request
+			if (!hasHeader(requestHeaders, Constants.CONTENT_TYPE_HEADER_NAME)) {
+				corehttpRequestBuilder.addHeader(Constants.CONTENT_TYPE_HEADER_NAME, Constants.BINARY_CONTENT_TYPE);
+				contenttype = Constants.BINARY_CONTENT_TYPE;
+			}
+		} else {
+			logger.logDebug("Sending " + serializable.getClass().getName() + " as request body");
+			final String serializeObject = serializer.serializeObject(serializable);
+			try {
+				bytesToWrite = serializeObject.getBytes(Constants.JSON_ENCODING);
+			} catch (final UnsupportedEncodingException ex) {
+				final ClientException clientException = new ClientException("Unsupported encoding problem: ",
+						ex);
+				logger.logError("Unsupported encoding problem: " + ex.getMessage(), ex);
+				throw clientException;
+			}
+
+			// If the user hasn't specified a Content-Type for the request
+			if (!hasHeader(requestHeaders, Constants.CONTENT_TYPE_HEADER_NAME)) {
+				corehttpRequestBuilder.addHeader(Constants.CONTENT_TYPE_HEADER_NAME, Constants.JSON_CONTENT_TYPE);
+				contenttype = Constants.JSON_CONTENT_TYPE;
+			}
+		}
+
+		RequestBody requestBody = null;
+		// Handle cases where we've got a body to process.
+		if (bytesToWrite != null) {
+			final String mediaContentType = contenttype;
+			requestBody = new RequestBody() {
+				@Override
+				public long contentLength() throws IOException {
+					return bytesToWrite.length;
+				}
+				@Override
+				public void writeTo(BufferedSink sink) throws IOException {
+					int writtenSoFar = 0;
+					try (final OutputStream out = sink.outputStream()) {
+						try (final BufferedOutputStream bos = new BufferedOutputStream(out)){
+							int toWrite;
+							do {
+								toWrite = Math.min(defaultBufferSize, bytesToWrite.length - writtenSoFar);
+								bos.write(bytesToWrite, writtenSoFar, toWrite);
+								writtenSoFar = writtenSoFar + toWrite;
+							} while (toWrite > 0);
+						}
+					}
+				}
+
+				@Override
+				public MediaType contentType() {
+					return MediaType.parse(mediaContentType);
+				}
+			};
+		}
+
+		corehttpRequestBuilder.method(request.getHttpMethod().toString(), requestBody);
+		return corehttpRequestBuilder.build();
+	}
+	/**
+	 * Sends the HTTP request
+	 *
+	 * @param request           the request description
+	 * @param resultClass       the class of the response from the service
+	 * @param serializable      the object to send to the service in the body of the request
+	 * @param handler           the handler for stateful response
+	 * @param <Result>          the type of the response object
+	 * @param <Body>            the type of the object to send to the service in the body of the request
+	 * @param <DeserializeType> the response handler for stateful response
+	 * @return                  the result from the request
+	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
+	 */
+	@Nullable
+	private <Result, Body, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendFutureRequestInternal(@Nonnull final IHttpRequest request,
+			@Nonnull final Class<Result> resultClass,
+			@Nullable final Body serializable,
+			@Nullable final IStatefulResponseHandler<Result, DeserializeType> handler)
+					throws ClientException {
+            final Request coreHttpRequest = getHttpRequest(request, resultClass, serializable);
+            final CoreHttpCallbackFutureWrapper wrapper = new CoreHttpCallbackFutureWrapper();
+            corehttpClient.newCall(coreHttpRequest).enqueue(wrapper);
+            return wrapper.future.thenApply(r -> processResponse(r, request, resultClass, serializable, handler));
+    }
+    /**
+	 * Sends the HTTP request
+	 *
+	 * @param request           the request description
+	 * @param resultClass       the class of the response from the service
+	 * @param serializable      the object to send to the service in the body of the request
+	 * @param handler           the handler for stateful response
+	 * @param <Result>          the type of the response object
+	 * @param <Body>            the type of the object to send to the service in the body of the request
+	 * @param <DeserializeType> the response handler for stateful response
+	 * @return                  the result from the request
+	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
+	 */
+	@Nullable
+	private <Result, Body, DeserializeType> Result sendRequestInternal(@Nonnull final IHttpRequest request,
+			@Nonnull final Class<Result> resultClass,
+			@Nullable final Body serializable,
+			@Nullable final IStatefulResponseHandler<Result, DeserializeType> handler)
+					throws ClientException {
+            final Request coreHttpRequest = getHttpRequest(request, resultClass, serializable);
+            try {
+                final Response response = corehttpClient.newCall(coreHttpRequest).execute();
+                return processResponse(response, request, resultClass, serializable, handler);
+            } catch(IOException ex) {
+                throw new ClientException("Error executing the request", ex);
+            }
+    }
+
+    @SuppressWarnings("unchecked")
+    private <Result, Body, DeserializeType> Result processResponse(final Response response,
+                                                                    final IHttpRequest request,
+                                                                    final Class<Result> resultClass,
+                                                                    final Body serializable,
+                                                                    final IStatefulResponseHandler<Result, DeserializeType> handler) {
+		try {
+            InputStream in = null;
+            boolean isBinaryStreamInput = false;
+            try {
+
+                // Call being executed
+
+
+                if (handler != null) {
+                    handler.configConnection(response);
+                }
+
+                logger.logDebug(String.format(Locale.ROOT, "Response code %d, %s",
+                        response.code(),
+                        response.message()));
+
+                if (handler != null) {
+                    logger.logDebug("StatefulResponse is handling the HTTP response.");
+                    return handler.generateResult(
+                            request, response, this.serializer, this.logger);
+                }
+
+                if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+                    logger.logDebug("Handling error response");
+                    in = response.body().byteStream();
+                    handleErrorResponse(request, serializable, response);
+                }
+
+                if (response.code() == HttpResponseCode.HTTP_NOBODY
+                        || response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
+                    logger.logDebug("Handling response with no body");
+                    return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
+                }
+
+                if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
+                    logger.logDebug("Handling accepted response");
+                    return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
+                }
+
+                in = new BufferedInputStream(response.body().byteStream());
+
+                final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
+
+                if(response.body() == null || response.body().contentLength() == 0)
+                    return (Result) null;
+
+                final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
+                if (contentType != null && resultClass != InputStream.class &&
+                            contentType.contains(Constants.JSON_CONTENT_TYPE)) {
+                    logger.logDebug("Response json");
+                    return handleJsonResponse(in, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
+                } else if (resultClass == InputStream.class) {
+                    logger.logDebug("Response binary");
+                    isBinaryStreamInput = true;
+                    return (Result) handleBinaryStream(in);
+                } else if (contentType != null && resultClass != InputStream.class &&
+                            contentType.contains(Constants.TEXT_CONTENT_TYPE)) {
+                    return handleRawResponse(in, resultClass);
+                } else {
+                    return (Result) null;
+                }
+            } finally {
+                if (!isBinaryStreamInput) {
+                    try{
+                        if (in != null) in.close();
+                    }catch(IOException e) {
+                        logger.logError(e.getMessage(), e);
+                    }
+                    if (response != null) response.close();
+                }
+            }
+        } catch (final GraphServiceException ex) {
+            final boolean shouldLogVerbosely = logger.getLoggingLevel() == LoggerLevel.DEBUG;
+            logger.logError("Graph service exception " + ex.getMessage(shouldLogVerbosely), ex);
+            throw ex;
+        } catch (final Exception ex) {
+            final ClientException clientException = new ClientException("Error during http request",
+                    ex);
+            logger.logError("Error during http request", clientException);
+            throw clientException;
+        }
+    }
+    /**
+	 * Handles the event of an error response
+	 *
+	 * @param request      the request that caused the failed response
+	 * @param serializable the body of the request
+	 * @param connection   the URL connection
+	 * @throws IOException an exception occurs if there were any problems interacting with the connection object
+	 */
+	private <Body> void handleErrorResponse(final IHttpRequest request,
+                                    final Body serializable,
+                                    final Response response)
+                                            throws IOException {
+        throw GraphServiceException.createFromResponse(request, serializable, serializer,
+            response, logger);
+    }
+    /**
+	 * Handles the cause where the response is a binary stream
+	 *
+	 * @param in the input stream from the response
+	 * @return   the input stream to return to the caller
+	 */
+	private InputStream handleBinaryStream(final InputStream in) {
+		return in;
+    }
+    /**
+	 * Handles the cause where the response is a JSON object
+	 *
+	 * @param in              the input stream from the response
+	 * @param responseHeaders the response header
+	 * @param clazz           the class of the response object
+	 * @param <Result>        the type of the response object
+	 * @return                the JSON object
+	 */
+	private <Result> Result handleJsonResponse(final InputStream in, Map<String, List<String>> responseHeaders, final Class<Result> clazz) {
+		if (clazz == null) {
+			return null;
+		}
+
+		final String rawJson = CoreHttpProvider.streamToString(in);
+		return serializer.deserializeObject(rawJson, clazz, responseHeaders);
+    }
+    /**
+	 * Handles the cause where the response is a Text object
+	 *
+	 * @param in              the input stream from the response
+	 * @param clazz           the class of the response object
+	 * @param <Result>        the type of the response object
+	 * @return                the Text object
+	 */
+    @SuppressWarnings("unchecked")
+    private <Result> Result handleRawResponse(final InputStream in, final Class<Result> clazz) {
+		if (clazz == null) {
+			return null;
+		}
+
+        final String rawText = CoreHttpProvider.streamToString(in);
+        if(clazz == Long.class) {
+            try {
+                return (Result) Long.valueOf(rawText);
+            } catch (NumberFormatException ex) {
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+    /**
+	 * Handles the case where the response body is empty
+	 *
+	 * @param responseHeaders the response headers
+	 * @param clazz           the type of the response object
+	 * @return                the JSON object
+	 */
+	private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHeaders, final Class<Result> clazz)
+        throws UnsupportedEncodingException{
+        //Create an empty object to attach the response headers to
+        InputStream in = new ByteArrayInputStream("{}".getBytes(Constants.JSON_ENCODING));
+        return handleJsonResponse(in, responseHeaders, clazz);
+    }
+
+	private Request convertIHttpRequestToOkHttpRequest(IHttpRequest request) {
+		if(request != null) {
+			Request.Builder requestBuilder = new Request.Builder();
+			requestBuilder.url(request.getRequestUrl());
+			for (final HeaderOption header : request.getHeaders()) {
+				requestBuilder.addHeader(header.getName(), header.getValue().toString());
+			}
+			return requestBuilder.build();
+		}
+		return null;
+	}
+
+	/**
+	 * Reads in a stream and converts it into a string
+	 *
+	 * @param input the response body stream
+	 * @return      the string result
+	 */
+    @Nullable
+	public static String streamToString(@Nonnull final InputStream input) {
+		final String httpStreamEncoding = "UTF-8";
+		final String endOfFile = "\\A";
+		try (final Scanner scanner = new Scanner(input, httpStreamEncoding)) {
+			scanner.useDelimiter(endOfFile);
+			if (scanner.hasNext()) {
+				return scanner.next();
+			}
+			return "";
+		}
+	}
+
+	/**
+	 * Searches for the given header in a list of HeaderOptions
+	 *
+	 * @param headers the list of headers to search through
+	 * @param header  the header name to search for (case insensitive)
+	 * @return        true if the header has already been set
+	 */
+	@VisibleForTesting
+	static boolean hasHeader(List<HeaderOption> headers, String header) {
+		for (HeaderOption option : headers) {
+			if (option.getName().equalsIgnoreCase(header)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Gets the logger in use
+	 *
+	 * @return the logger
+	 */
+	@VisibleForTesting
+	@Nullable
+	public ILogger getLogger() {
+		return logger;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/CustomRequest.java b/src/main/java/com/microsoft/graph/http/CustomRequest.java
new file mode 100644
index 000000000..714054bb6
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/CustomRequest.java
@@ -0,0 +1,197 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.JsonObject;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+
+/**
+ * Respresents a custom request to be executed against the service
+ *
+ * @param <T> the entity or complex type
+ */
+public class CustomRequest<T> extends BaseRequest<T> {
+
+    /**
+     * Instanciates a custom requests to be executed against the service
+     *
+     * @param requestUrl the URL to send the request to
+     * @param client the client to use to send the request
+     * @param requestOptions the options to apply to the request
+     * @param responseClass the class for response deserialization
+     */
+	public CustomRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends Option> requestOptions, @Nonnull final Class<T> responseClass) {
+		super(requestUrl, client, requestOptions, responseClass);
+    }
+
+    /**
+     * Creates a custom requests to be executed against the service
+     *
+     * @param requestUrl the URL to send the request to
+     * @param client the client to use to send the request
+     * @param requestOptions the options to apply to the request
+     * @return the request to execute against the service
+     */
+    @Nonnull
+    public static CustomRequest<JsonObject> create(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends Option> requestOptions) {
+        return new CustomRequest<JsonObject>(requestUrl, client, requestOptions, JsonObject.class);
+    }
+
+    /**
+     * Gets the resource and returns the deserialized resource
+     *
+     * @return the deserialized resource
+     */
+    @Nullable
+    public T get() throws ClientException {
+        return send(HttpMethod.GET, null);
+    }
+
+    /**
+     * Gets the resource and calls the callback with the deserialized resource
+     *
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futureGet() {
+    	return futureSend(HttpMethod.GET, null);
+    }
+
+    /**
+     * Delete this item from the service
+     *
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futureDelete() {
+        return futureSend(HttpMethod.DELETE, null);
+    }
+
+    /**
+     * Delete this item from the service
+     *
+     * @throws ClientException if there was an exception during the delete operation
+     */
+    public void delete() throws ClientException {
+        send(HttpMethod.DELETE, null);
+    }
+
+    /**
+     * Patches this item with a source
+     *
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futurePatch() {
+        return futureSend(HttpMethod.PATCH, super.getResponseType());
+    }
+
+    /**
+     * Patches this item with a source
+     *
+     * @param sourceObject     the source object with updates
+     * @return                 the updated item
+     * @throws ClientException this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    public T patch(@Nonnull final T sourceObject) throws ClientException {
+        return send(HttpMethod.PATCH, sourceObject);
+    }
+
+    /**
+     * Creates a new object
+     *
+     * @param newObject the new object to create
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futurePost(@Nonnull final T newObject) {
+        return futureSend(HttpMethod.POST, newObject);
+    }
+
+    /**
+     * Creates a new object
+     *
+     * @param newObject        the new object to create
+     * @return                 the created object
+     * @throws ClientException this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    public T post(@Nonnull final T newObject) throws ClientException {
+        return send(HttpMethod.POST, newObject);
+    }
+
+    /**
+     * Creates a new object
+     *
+     * @param putObject the new object to create
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futurePut(@Nonnull final T putObject) {
+        return futureSend(HttpMethod.PUT, putObject);
+    }
+
+    /**
+     * Creates a new object
+     *
+     * @param putObject        the new object to create
+     * @return                 the created object
+     * @throws ClientException this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    public T put(@Nonnull final T putObject) throws ClientException {
+        return send(HttpMethod.PUT, putObject);
+    }
+
+    /**
+     * Sets the select clause for the request
+     *
+     * @param value the select clause
+     * @return      the updated request
+     */
+     @Nonnull
+     public CustomRequest<T> select(@Nonnull final String value) {
+         getQueryOptions().add(new QueryOption("$select", value));
+         return this;
+     }
+
+    /**
+     * Sets the expand clause for the request
+     *
+     * @param value the expand clause
+     * @return      the updated request
+     */
+     @Nonnull
+     public CustomRequest<T> expand(@Nonnull final String value) {
+         getQueryOptions().add(new QueryOption("$expand", value));
+         return this;
+     }
+}
diff --git a/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java b/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
new file mode 100644
index 000000000..a88333d33
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
@@ -0,0 +1,82 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.JsonObject;
+import com.microsoft.graph.serializer.AdditionalDataManager;
+import com.microsoft.graph.serializer.ISerializer;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A page of results from a delta collection
+ *
+ * @param <T> the type of the item contained within the collection
+ */
+public class DeltaCollectionPage<T, T2 extends BaseRequestBuilder<T>> extends BaseCollectionPage<T, T2> {
+    /**
+     * The opaque link to query delta after the 
+     * initial request
+     */
+    @Nullable
+    public String deltaLink;
+
+    /**
+     * A collection page for the delta response.
+     *
+     * @param response The serialized delta reponse from the service
+     * @param builder The request builder for the next collection page
+     */
+    public DeltaCollectionPage(@Nonnull final ICollectionResponse<T> response, @Nullable final T2 builder) {
+       super(response.values(), builder, response.additionalDataManager());
+        if (response.getRawObject().get("@odata.deltaLink") != null) {
+            deltaLink = response.getRawObject().get("@odata.deltaLink").getAsString();
+        } else {
+            deltaLink = null;
+        }
+    }
+
+    /**
+     * Creates the collection page
+     *
+     * @param pageContents       the contents of this page
+     * @param nextRequestBuilder the request builder for the next page
+     */
+    public DeltaCollectionPage(@Nonnull final List<T> pageContents, @Nullable final T2 nextRequestBuilder) {
+        super(pageContents, nextRequestBuilder);
+    }
+    /**
+     * The deltaLink to make future delta requests
+     *
+     * @return String The deltaLink URL
+     */
+    @Nullable
+    public String deltaLink() {
+        return deltaLink;
+    }
+
+}
diff --git a/src/main/java/com/microsoft/graph/http/GraphError.java b/src/main/java/com/microsoft/graph/http/GraphError.java
new file mode 100644
index 000000000..a436a915c
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/GraphError.java
@@ -0,0 +1,74 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.annotations.SerializedName;
+
+import com.microsoft.graph.core.GraphErrorCodes;
+import com.google.gson.annotations.Expose;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Represents an error returned by the service
+ */
+public class GraphError {
+
+    /** The error message */
+    @SerializedName("message")
+    @Expose()
+    @Nullable
+    public String message;
+
+    /** The error code */
+    @SerializedName("code")
+    @Expose()
+    @Nullable
+    public String code;
+
+    /** The inner error */
+    @SerializedName("innererror")
+    @Nullable
+    public GraphInnerError innererror;
+
+    /**
+     * Determine if the given error code is the one that is expected
+     * 
+     * @param expectedCode the expected error code
+     * @return <b>true</b> if the error code matches, and <b>false</b> if there was no match
+     */
+    public boolean isError(@Nonnull final GraphErrorCodes expectedCode) {
+        if (code.equalsIgnoreCase(expectedCode.toString())) {
+            return true;
+        }
+        GraphInnerError innerError = innererror;
+        while (null != innerError) {
+            if (innerError.code.equalsIgnoreCase(expectedCode.toString())) {
+                return true;
+            }
+            innerError = innerError.innererror;
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
new file mode 100644
index 000000000..c72db98f4
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
@@ -0,0 +1,87 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.serializer.AdditionalDataManager;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * Represents the error response body returned by the service
+ */
+public class GraphErrorResponse implements IJsonBackedObject {
+
+    private AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    /** The error returned by the response */
+    @SerializedName("error")
+    @Expose()
+    @Nullable
+    public GraphError error;
+
+    /**
+     * The raw representation of this class when deserialized
+     */
+    @Expose(serialize = false, deserialize = false)
+    @Nullable
+    public JsonObject rawObject;
+
+    /**
+     * Sets the raw JSON object
+     */
+    @Override
+    public void setRawObject(@Nullable final ISerializer serializer, @Nonnull final JsonObject json) {
+        rawObject = json;
+    }
+
+    @Override
+    @Nullable
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+
+    @Override
+    @Nullable
+    public ISerializer getSerializer() {
+        return null;
+    }
+
+    /**
+     * Gets the raw JSON object for this object as parsed from
+     * @return the JSON that this object was derived from
+     */
+    @Override
+    @Nullable
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+}
+
+
diff --git a/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java b/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
new file mode 100644
index 000000000..d7ae1a1c4
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
@@ -0,0 +1,71 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An unexpected exception from the Graph service
+ */
+public class GraphFatalServiceException extends GraphServiceException {
+
+    private static final long serialVersionUID = -4974392424026672738L;
+
+    /**
+     * Create a fatal Graph service exception
+     * 
+     * @param method          the method that caused the exception
+     * @param url             the URL
+     * @param requestHeaders  the request headers
+     * @param requestBody     the request body
+     * @param responseCode    the response code
+     * @param responseMessage the response message
+     * @param responseHeaders the response headers
+     * @param error           the error response if available
+     * @param verbose         whether or not to log verbosely
+     */
+    protected GraphFatalServiceException(@Nonnull final String method,
+                                         @Nonnull final String url,
+                                         @Nonnull final List<String> requestHeaders,
+                                         @Nullable final String requestBody,
+                                         final int responseCode,
+                                         @Nullable final String responseMessage,
+                                         @Nonnull final List<String> responseHeaders,
+                                         @Nullable final GraphErrorResponse error,
+                                         final boolean verbose) {
+        super(method, url, requestHeaders, requestBody, responseCode, responseMessage, responseHeaders, error, verbose);
+    }
+
+    @Override
+    @Nullable
+    public String getMessage(final boolean verbose) {
+        //no inspection StringBufferReplaceableByString
+        final StringBuilder sb = new StringBuilder();
+        sb.append("Unexpected exception returned from the service.")
+                .append(super.getMessage(verbose));
+        return sb.toString();
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/GraphInnerError.java b/src/main/java/com/microsoft/graph/http/GraphInnerError.java
new file mode 100644
index 000000000..9516c1845
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/GraphInnerError.java
@@ -0,0 +1,64 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.annotations.SerializedName;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Represents an inner error returned by the service
+ */
+public class GraphInnerError {
+
+    /** The error code */
+    @SerializedName("code")
+    @Nullable
+    public String code;
+
+    /** The error type */
+    @SerializedName("errorType")
+    @Nullable
+    public String errorType;
+
+    /** The debug message */
+    @SerializedName("debugMessage")
+    @Nullable
+    public String debugMessage;
+
+    /** The stacktrace */
+    @SerializedName("stackTrace")
+    @Nullable
+    public String stackTrace;
+
+    /** The throw site */
+    @SerializedName("throwSite")
+    @Nullable
+    public String throwSite;
+
+    /** The inner error */
+    @SerializedName("innererror")
+    @Nullable
+    public GraphInnerError innererror;
+}
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
new file mode 100644
index 000000000..330d69885
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -0,0 +1,422 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Collections;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.ISerializer;
+
+import okhttp3.Response;
+import static okhttp3.internal.Util.closeQuietly;
+
+/**
+ * An exception from the Graph service
+ */
+public class GraphServiceException extends ClientException {
+    private final static HttpResponseHeadersHelper  responseHeadersHelper = new HttpResponseHeadersHelper();
+
+    private static final long serialVersionUID = -7416427229421064119L;
+
+    /**
+     * New line delimiter
+     */
+    protected static final char NEW_LINE = '\n';
+
+    /**
+     * How truncated values are shown
+     */
+    protected static final String TRUNCATION_MARKER = "[...]";
+
+    /**
+     * The maximum length for a single line string when trying to be brief
+     */
+    protected static final int MAX_BREVITY_LENGTH = 50;
+
+    /**
+     * The number of bytes to display when showing byte array
+     */
+    protected static final int MAX_BYTE_COUNT_BEFORE_TRUNCATION = 8;
+
+    /**
+     * The internal server error threshold defined by the HTTP protocol
+     */
+    public static final int INTERNAL_SERVER_ERROR = 500;
+
+    /**
+     * The GraphError response
+     */
+    private final transient GraphErrorResponse error;
+
+    /**
+     * The HTTP method
+     */
+    private final String method;
+
+    /**
+     * The request URL
+     */
+    private final String url;
+
+    /**
+     * The request headers
+     */
+    private final List<String> requestHeaders;
+
+    /**
+     * The request body represented as a string
+     */
+    private final String requestBody;
+
+    /**
+     * The HTTP status code
+     */
+    private final int responseCode;
+
+    /**
+     * The HTTP status message
+     */
+    private final String responseMessage;
+
+    /**
+     * The response headers
+     */
+    private final List<String> responseHeaders;
+
+    /**
+     * Whether to log the full error response
+     */
+    private final boolean verbose;
+
+    /**
+     * Create a Graph service exception
+     *
+     * @param method          the method that caused the exception
+     * @param url             the URL
+     * @param requestHeaders  the request headers
+     * @param requestBody     the request body
+     * @param responseCode    the response code
+     * @param responseMessage the response message
+     * @param responseHeaders the response headers
+     * @param error           the error response if available
+     * @param verbose         the error response log level
+     */
+    protected GraphServiceException(@Nonnull final String method,
+                                    @Nonnull final String url,
+                                    @Nonnull final List<String> requestHeaders,
+                                    @Nullable final String requestBody,
+                                    final int responseCode,
+                                    @Nullable final String responseMessage,
+                                    @Nonnull final List<String> responseHeaders,
+                                    @Nullable final GraphErrorResponse error,
+                                    final boolean verbose) {
+        super(responseMessage, null);
+        this.method = method;
+        this.url = url;
+        this.requestHeaders = requestHeaders;
+        this.requestBody = requestBody;
+        this.responseCode = responseCode;
+        this.responseMessage = responseMessage;
+        this.responseHeaders = responseHeaders;
+        this.error = error;
+        this.verbose = verbose;
+        for(String requestHeader : requestHeaders) {
+            for(String headerKeyToRedact : requestHeadersToRedact) {
+                if(requestHeader.startsWith(headerKeyToRedact)) {
+                    Collections.replaceAll(requestHeaders, requestHeader, headerKeyToRedact + " : [PII_REDACTED]");
+                    break;
+                }
+            }
+        }
+    }
+    private static String[] requestHeadersToRedact = {"Authorization"};
+    /**
+     * Gets the The HTTP response message
+     *
+     * @return The HTTP response message
+     */
+    @Nullable
+    public String getResponseMessage() {
+    	return responseMessage;
+    }
+
+    @Override
+    @Nullable
+    public String getMessage() {
+        return getMessage(verbose);
+    }
+    
+    /**
+     * Gets the HTTP status code
+     *
+     * @return The HTTP status response code
+     */
+    public int getResponseCode() {
+    	return responseCode;
+    }
+
+    /**
+     * Gets the response headers
+     * @return the response headers
+     */
+    @Nonnull
+    public List<String> getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    /**
+     * Gets the error returned by the service
+     * @return the error returned by the service
+     */
+    @Nullable
+    public GraphErrorResponse getError() {
+        return error;
+    }
+
+    /**
+     * Gets the HTTP method of the request
+     * @return the HTTP method of the request
+     */
+    @Nonnull
+    public String getMethod() {
+        return method;
+    }
+
+    /**
+     * Gets the URL of the request
+     * @return the URL of the request
+     */
+    @Nonnull
+    public String getUrl() {
+        return url;
+    }
+    
+    /**
+     * Gets the request headers
+     * @return the request headers
+     */
+    @Nonnull
+    public List<String> getRequestHeaders() {
+        return requestHeaders;
+    }
+
+    /**
+     * Gets the message for this exception
+     *
+     * @param verbose if the message should be brief or more verbose
+     * @return        the message.
+     */
+    @Nullable
+    public String getMessage(final boolean verbose) {
+        final StringBuilder sb = new StringBuilder();
+        if (error != null && error.error != null) {
+            sb.append("Error code: ").append(error.error.code).append(NEW_LINE);
+            sb.append("Error message: ").append(error.error.message).append(NEW_LINE);
+            sb.append(NEW_LINE);
+        }
+        // Request information
+        sb.append(method).append(' ').append(url).append(NEW_LINE);
+        for (final String header : requestHeaders) {
+            if (verbose) {
+                sb.append(header);
+            } else {
+                final String truncatedHeader = header.substring(0, Math.min(MAX_BREVITY_LENGTH, header.length()));
+                sb.append(truncatedHeader);
+                if (truncatedHeader.length() == MAX_BREVITY_LENGTH) {
+                    sb.append(TRUNCATION_MARKER);
+                }
+            }
+            sb.append(NEW_LINE);
+        }
+        if (requestBody != null) {
+            if (verbose) {
+                sb.append(requestBody);
+            } else {
+                final int bodyLength = Math.min(MAX_BREVITY_LENGTH, requestBody.length());
+                final String truncatedBody = requestBody.substring(0, bodyLength);
+                sb.append(truncatedBody);
+                if (truncatedBody.length() == MAX_BREVITY_LENGTH) {
+                    sb.append(TRUNCATION_MARKER);
+                }
+            }
+        }
+        sb.append(NEW_LINE).append(NEW_LINE);
+
+        // Response information
+        sb.append(responseCode).append(" : ").append(responseMessage).append(NEW_LINE);
+        for (final String header : responseHeaders) {
+            if (verbose) {
+                sb.append(header).append(NEW_LINE);
+            } else {
+                if (header.toLowerCase(Locale.ROOT).startsWith("x-throwsite")) {
+                    sb.append(header).append(NEW_LINE);
+                }
+            }
+        }
+        if (verbose && error != null && error.rawObject != null) {
+            try {
+                final Gson gson = new GsonBuilder().setPrettyPrinting().create();
+                sb.append(gson.toJson(error.rawObject)).append(NEW_LINE);
+            } catch (final RuntimeException ignored) {
+                sb.append("[Warning: Unable to parse error message body]").append(NEW_LINE);
+            }
+        } else {
+        	if (!verbose) {
+        		sb.append(TRUNCATION_MARKER).append(NEW_LINE).append(NEW_LINE);
+                sb.append("[Some information was truncated for brevity, enable debug logging for more details]");
+        	}
+        }
+        return sb.toString();
+    }
+
+    /**
+     * Gets the error message from the Graph service object
+     *
+     * @return the error message
+     */
+    @Nullable
+    public GraphError getServiceError() {
+        return error.error;
+    }
+
+    /**
+     * Creates a Graph service exception from a given failed HTTP request
+     *
+     * @param request      the request that resulted in this failure
+     * @param serializable the serialized object that was sent with this request
+     * @param serializer   the serializer to re-create the option in its over the wire state
+     * @param response   the response being used to extract information from
+     * @param logger       the logger to log exception information to
+     * @param <T>          the type of the serializable object
+     * @return             the new GraphServiceException instance
+     * @throws IOException an exception occurs if there were any problems processing the connection
+     */
+    @Nonnull
+    public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpRequest request,
+                                                                 @Nullable final T serializable,
+                                                                 @Nonnull final ISerializer serializer,
+                                                                 @Nullable final Response response,
+                                                                 @Nonnull final ILogger logger)
+            throws IOException {
+        final String method = response.request().method();
+        final String url = request.getRequestUrl().toString();
+        final List<String> requestHeaders = new LinkedList<>();
+        for (final HeaderOption option : request.getHeaders()) {
+            requestHeaders.add(option.getName() + " : " + option.getValue());
+        }
+        boolean isVerbose = logger.getLoggingLevel() == LoggerLevel.DEBUG;
+        final String requestBody;
+        if (serializable instanceof byte[]) {
+            final byte[] bytes = (byte[]) serializable;
+            StringBuilder sb = new StringBuilder();
+            sb.append("byte[").append(bytes.length).append("]");
+
+            sb.append(" {");
+            if (isVerbose) {
+            	sb.append(bytes);
+            } else {
+	            for (int i = 0; i < MAX_BYTE_COUNT_BEFORE_TRUNCATION && i < bytes.length; i++) {
+	                sb.append(bytes[i]).append(", ");
+	            }
+	            if (bytes.length > MAX_BYTE_COUNT_BEFORE_TRUNCATION) {
+	                sb.append(TRUNCATION_MARKER).append("}");
+	            }
+            }
+            requestBody = sb.toString();
+        } else if (serializable != null) {
+            requestBody = serializer.serializeObject(serializable);
+        } else {
+            requestBody = null;
+        }
+
+        final int responseCode = response.code();
+        final List<String> responseHeaders = new LinkedList<>();
+        final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
+        for (final String key : headers.keySet()) {
+            final String fieldPrefix;
+            if (key == null) {
+                fieldPrefix = "";
+            } else {
+                fieldPrefix = key + " : ";
+            }
+            responseHeaders.add(fieldPrefix + headers.get(key));
+        }
+
+        final String responseMessage = response.message();
+        String rawOutput = "{}";
+
+        InputStream is = response.body().byteStream();
+        try {
+            rawOutput = CoreHttpProvider.streamToString(is);
+        } finally {
+            closeQuietly(is);
+        }
+        GraphErrorResponse error;
+        try {
+            error = serializer.deserializeObject(rawOutput, GraphErrorResponse.class, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response));
+        } catch (final Exception ex) {
+            error = new GraphErrorResponse();
+            error.error = new GraphError();
+            error.error.code = "Unable to parse error response message";
+            error.error.message = "Raw error: " + rawOutput;
+            error.error.innererror = new GraphInnerError();
+            error.error.innererror.code = ex.getMessage();
+        }
+
+        if (responseCode >= INTERNAL_SERVER_ERROR) {
+            return new GraphFatalServiceException(method,
+                    url,
+                    requestHeaders,
+                    requestBody,
+                    responseCode,
+                    responseMessage,
+                    responseHeaders,
+                    error,
+                    isVerbose);
+        }
+
+        return new GraphServiceException(method,
+                url,
+                requestHeaders,
+                requestBody,
+                responseCode,
+                responseMessage,
+                responseHeaders,
+                error,
+                isVerbose);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/HttpMethod.java b/src/main/java/com/microsoft/graph/http/HttpMethod.java
new file mode 100644
index 000000000..48307c2ee
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/HttpMethod.java
@@ -0,0 +1,54 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+/**
+ * The HTTP method for a request
+ */
+public enum HttpMethod {
+
+    /**
+     * Get
+     */
+    GET,
+
+    /**
+     * Post
+     */
+    POST,
+
+    /**
+     * Patch
+     */
+    PATCH,
+
+    /**
+     * Delete
+     */
+    DELETE,
+
+    /**
+     * Put
+     */
+    PUT,
+}
diff --git a/src/main/java/com/microsoft/graph/http/HttpResponseCode.java b/src/main/java/com/microsoft/graph/http/HttpResponseCode.java
new file mode 100644
index 000000000..6fa3085b7
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/HttpResponseCode.java
@@ -0,0 +1,69 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+/**
+ * The HTTP code for the HTTP request
+ */
+public final class  HttpResponseCode {
+
+    /**
+     * HTTP response code OK
+     */
+    public static final int HTTP_OK = 200;
+
+    /**
+     * HTTP response code for created
+     */
+    public static final int HTTP_CREATED = 201;
+
+    /**
+     * HTTP response code for accepted
+     */
+    public static final int HTTP_ACCEPTED = 202;
+
+    /**
+     * HTTP response code for no body
+     */
+    public static final int HTTP_NOBODY = 204;
+
+    /**
+     * HTTP response code for multiple choices
+     */
+    public static final int HTTP_MULTIPLE_CHOICES = 300;
+
+    /**
+     * HTTP response code for see other
+     */
+    public static final int HTTP_SEE_OTHER = 303;
+
+    /**
+     * HTTP response code for not modified
+     */
+    public static final int HTTP_NOT_MODIFIED = 304;
+
+    /**
+     * HTTP response code for error response
+     */
+    public static final int HTTP_CLIENT_ERROR = 400;
+}
diff --git a/src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java b/src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java
new file mode 100644
index 000000000..5fd0f4788
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java
@@ -0,0 +1,53 @@
+package com.microsoft.graph.http;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.annotation.Nonnull;
+
+import okhttp3.Headers;
+import okhttp3.Response;
+
+/** Internal utility class to help parsing the response headers */
+public class HttpResponseHeadersHelper {
+    /**
+	 * Gets the response headers from OkHttp Response
+	 *
+	 * @param response the OkHttp response
+	 * @return           the set of headers names and value
+	 */
+	@Nonnull
+	public Map<String, String> getResponseHeadersAsMapStringString(@Nonnull final Response response) {
+		final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+		int index = 0;
+		final Headers responseHeaders = response.headers();
+		while (index < responseHeaders.size()) {
+			final String headerName = responseHeaders.name(index);
+			final String headerValue = responseHeaders.value(index);
+			if (headerName == null || headerValue == null) {
+				break;
+			}
+			headers.put(headerName, headerValue);
+			index++;
+		}
+		return headers;
+    }
+    
+    /**
+	 * Gets the response headers from OkHttp Response
+	 *
+	 * @param response the OkHttp response
+	 * @return           the set of headers names and value
+	 */
+	@Nonnull
+	public Map<String, List<String>> getResponseHeadersAsMapOfStringList(@Nonnull final Response response) {
+		final Map<String, List<String>> headerFields = response.headers().toMultimap();
+		// Add the response code
+		final List<String> list = new ArrayList<>();
+		headerFields.put("responseCode", list);
+		return headerFields;
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/http/ICollectionResponse.java b/src/main/java/com/microsoft/graph/http/ICollectionResponse.java
new file mode 100644
index 000000000..6d7174e56
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/ICollectionResponse.java
@@ -0,0 +1,28 @@
+package com.microsoft.graph.http;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * Represents a response of a collection of items returned by the service
+ * @param <T> the type for the items in the response.
+ */
+public interface ICollectionResponse<T> extends IJsonBackedObject{
+    /** 
+     * Gets the deserialized values the response contains
+     * @return the deserialized values for the response
+     */
+    @Nullable
+    List<T> values();
+
+    /**
+     * Gets the link to the next page of this collection
+     * @return The URL to the next page of this collection, or null
+     */
+    @Nullable
+    String nextLink();
+}
diff --git a/src/main/java/com/microsoft/graph/http/IHttpProvider.java b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
new file mode 100644
index 000000000..6bb3f7edd
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
@@ -0,0 +1,137 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import javax.annotation.Nullable;
+
+import java.util.concurrent.ExecutorService;
+
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.serializer.ISerializer;
+
+import okhttp3.Request;
+
+/**
+ * Sends HTTP requests
+ */
+public interface IHttpProvider {
+
+    /**
+     * Get the serializer for this HTTP provider
+     *
+     * @return the serializer for this provider
+     */
+    @Nullable
+    ISerializer getSerializer();
+
+    /**
+     * Sends the HTTP request asynchronously
+     *
+     * @param request      the request description
+     * @param resultClass  the class of the response from the service
+     * @param serializable the object to send to the service in the body of the request
+     * @param <Result>     the type of the response object
+     * @param <BodyType>   the type of the object to send to the service in the body of the request
+     * @return a future with the result
+     */
+    @Nonnull
+    <Result, BodyType> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+                                 @Nonnull final Class<Result> resultClass,
+                                 @Nullable final BodyType serializable);
+
+    /**
+     * Sends the HTTP request
+     *
+     * @param request           the request description
+     * @param resultClass       the class of the response from the service
+     * @param serializable      the object to send to the service in the body of the request
+     * @param handler           the handler for stateful response
+     * @param <Result>          the expected return type return
+     * @param <BodyType>        the type of the object to send to the service in the body of the request
+     * @param <DeserializeType> the type of the HTTP response object
+     * @return                  a future with the result
+     * @throws ClientException  this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+                                                    @Nonnull final Class<Result> resultClass,
+                                                    @Nullable final BodyType serializable,
+                                                    @Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler)
+            throws ClientException;
+
+
+    /**
+     * Sends the HTTP request
+     *
+     * @param request      the request description
+     * @param resultClass  the class of the response from the service
+     * @param serializable the object to send to the service in the body of the request
+     * @param <Result>     the type of the response object
+     * @param <BodyType>   the type of the object to send to the service in the body of the request
+     * @return             the result from the request
+     * @throws ClientException this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    <Result, BodyType> Result send(@Nonnull final IHttpRequest request,
+                                   @Nonnull final Class<Result> resultClass,
+                                   @Nullable final BodyType serializable)
+            throws ClientException;
+
+    /**
+     * Sends the HTTP request
+     *
+     * @param request           the request description
+     * @param resultClass       the class of the response from the service
+     * @param serializable      the object to send to the service in the body of the request
+     * @param handler           the handler for stateful response
+     * @param <Result>          the expected return type return
+     * @param <BodyType>        the type of the object to send to the service in the body of the request
+     * @param <DeserializeType> the type of the HTTP response object
+     * @return                  the expected result object for the request
+     * @throws ClientException  this exception occurs if the request was unable to complete for any reason
+     */
+     @Nullable
+    <Result, BodyType, DeserializeType> Result send(@Nonnull final IHttpRequest request,
+                                                    @Nonnull final Class<Result> resultClass,
+                                                    @Nullable final BodyType serializable,
+                                                    @Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler)
+            throws ClientException;
+    /**
+	 * Sends the HTTP request
+	 *
+	 * @param request           the request description
+	 * @param resultClass       the class of the response from the service
+	 * @param serializable      the object to send to the service in the body of the request
+	 * @param <Result>          the type of the response object
+	 * @param <BodyType>        the type of the object to send to the service in the body of the request
+	 * @return                  the result from the request
+	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
+	 */
+    @Nullable
+    <Result, BodyType> Request getHttpRequest(@Nonnull final IHttpRequest request,
+                                              @Nonnull final Class<Result> resultClass,
+                                              @Nullable final BodyType serializable)
+            throws ClientException;
+}
diff --git a/src/main/java/com/microsoft/graph/http/IHttpRequest.java b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
new file mode 100644
index 000000000..0885b32a5
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
@@ -0,0 +1,196 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
+import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
+
+import okhttp3.Request;
+
+import java.net.URL;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An HTTP request
+ */
+public interface IHttpRequest {
+
+    /**
+     * Gets the request URL
+     * 
+     * @return the request URL
+     */
+    @Nullable
+    URL getRequestUrl();
+
+    /**
+     * Gets the HTTP method
+     * 
+     * @return the HTTP method
+     */
+    @Nullable
+    HttpMethod getHttpMethod();
+
+    /**
+     * Gets the headers
+     * 
+     * @return the headers
+     */
+    @Nullable
+    List<HeaderOption> getHeaders();
+
+    /**
+     * Gets the options
+     * 
+     * @return the options
+     */
+    @Nullable
+    List<Option> getOptions();
+
+    /**
+     * Adds a header to this request
+     * 
+     * @param header the name of the header
+     * @param value  the value of the header
+     */
+    void addHeader(@Nonnull String header, @Nonnull String value);
+
+    /**
+     * Sets useCaches parameter to cache the response
+     * 
+     * @param useCaches the value of useCaches
+     */
+    void setUseCaches(boolean useCaches);
+
+    /**
+     * Gets useCaches parameter
+     * 
+     * @return the value of useCaches
+     */
+    boolean getUseCaches();
+    
+    /**
+     * Sets the max redirects
+     * 
+     * @param maxRedirects Max redirects that a request can take
+     */
+    void setMaxRedirects(int maxRedirects);
+    
+    /**
+     * Gets the max redirects
+     * 
+     * @return Max redirects that a request can take
+     */
+    int getMaxRedirects();
+    
+    /**
+     * Sets the should redirect callback
+     * 
+     * @param shouldRedirect Callback called before doing a redirect
+     */
+    void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect);
+    
+    /**
+     * Gets the should redirect callback
+     * 
+     * @return Callback which is called before redirect
+     */
+    @Nullable
+    IShouldRedirect getShouldRedirect();
+    
+    /**
+     * Sets the should retry callback
+     * 
+     * @param shouldretry The callback called before retry
+     */
+    void setShouldRetry(@Nonnull IShouldRetry shouldretry);
+    
+    /**
+     * Gets the should retry callback
+     * 
+     * @return Callback called before retry
+     */
+    @Nullable
+    IShouldRetry getShouldRetry();
+    
+    /**
+     * Sets the max retries
+     * 
+     * @param maxRetries Max retries for a request
+     */
+    void setMaxRetries(int maxRetries);
+    
+    /**
+     * Gets max retries 
+     * 
+     * @return Max retries for a request
+     */
+    int getMaxRetries();
+    
+    /**
+     * Sets the delay in seconds between retires
+     * 
+     * @param delay Delay in seconds between retries
+     */
+    void setDelay(long delay);
+    
+    /**
+     * Gets delay between retries
+     * 
+     * @return Delay between retries in seconds
+     */
+    long getDelay();
+
+    /**
+     * Sets the HTTP method and returns the current request
+     *
+     * @param httpMethod the HTTP method
+     * @return the current request
+     */
+    @Nullable
+    IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod);
+    
+    /**
+     * Returns the Request object to be executed
+     * @return the Request object to be executed
+     */
+    @Nullable
+    Request getHttpRequest() throws ClientException;
+
+    /**
+     * Returns the Request object to be executed
+     * @param serializedObject the object to serialize at the body of the request
+     * @param <requestBodyType> the type of the serialized object
+     * @param <responseType> the type of the response
+     * @return the Request object to be executed
+     */
+    @Nullable
+    <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException;
+}
+
diff --git a/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java b/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java
new file mode 100644
index 000000000..cdb6582e3
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java
@@ -0,0 +1,29 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+/**
+ * A request for a binary stream
+ */
+public interface IHttpStreamRequest extends IHttpRequest {
+}
diff --git a/src/main/java/com/microsoft/graph/http/IRequestBuilder.java b/src/main/java/com/microsoft/graph/http/IRequestBuilder.java
new file mode 100644
index 000000000..a32742cbf
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/IRequestBuilder.java
@@ -0,0 +1,60 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.core.IBaseClient;
+
+/**
+ * Builder for a request
+ */
+public interface IRequestBuilder {
+
+    /**
+     * Gets the client for this request builder
+     * 
+     * @return the client for this request builder
+     */
+    @Nullable
+    IBaseClient getClient();
+
+    /**
+     * Gets the request URL
+     * 
+     * @return the request URL
+     */
+    @Nullable
+    String getRequestUrl();
+
+    /**
+     * Gets the request URL with an additional segment
+     * 
+     * @param urlSegment the segment to add to the URL
+     * @return           the new request URL
+     */
+    @Nonnull
+    String getRequestUrlWithAdditionalSegment(@Nonnull final String urlSegment);
+}
diff --git a/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java b/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java
new file mode 100644
index 000000000..b4343def5
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java
@@ -0,0 +1,65 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.ISerializer;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import okhttp3.Response;
+
+/**
+ * The handler interface for requests having stateful response from server.
+ * The handler will custom the HTTP connection if needed and generate request
+ * result based on the server HTTP response.
+ *
+ * @param <ResultType>       the result to return
+ * @param <DeserializedType> the deserialize type for serializer
+ */
+public interface IStatefulResponseHandler<ResultType, DeserializedType> {
+    /**
+     * Configure the response
+     *
+     * @param response the HTTP response
+     */
+    void configConnection(@Nonnull final Response response);
+    
+    /**
+     * Generate result after receiving response
+     *
+     * @param request    the HTTP request
+     * @param response the HTTP connection
+     * @param serializer the serializer for parsing response
+     * @param logger     the logger
+     * @return           the result generated by this handler
+     * @throws Exception an exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    ResultType generateResult(@Nonnull final IHttpRequest request,
+                              @Nonnull final Response response,
+                              @Nonnull final ISerializer serializer,
+                              @Nonnull final ILogger logger) throws Exception;
+}
diff --git a/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java b/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
new file mode 100644
index 000000000..eeb5685ae
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
@@ -0,0 +1,72 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.http.IRequestBuilder;
+import com.microsoft.graph.core.ClientException;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequest;
+import com.microsoft.graph.http.HttpMethod;
+
+/**
+ * The class for the Primitive Request.
+ * @param <T> the primitive type to deserialize the response to
+ */
+public class PrimitiveRequest<T> extends BaseRequest<T> {
+
+    /**
+     * The request for the primitive type
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param primitiveTypeClass the return type class for the request
+     */
+    public PrimitiveRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
+        super(requestUrl, client, requestOptions, primitiveTypeClass);
+    }
+
+    /**
+     * Gets the primitive information from the service
+     *
+     * @return a future with the result
+     */
+    @Nonnull
+    public java.util.concurrent.CompletableFuture<T> futureGet() {
+        return futureSend(HttpMethod.GET, null);
+    }
+
+    /**
+     * Gets the primitive information from the service
+     *
+     * @return the primitive information from the request
+     * @throws ClientException this exception occurs if the request was unable to complete for any reason
+     */
+    @Nullable
+    public T get() throws ClientException {
+       return send(HttpMethod.GET, null);
+    }
+}
+
diff --git a/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java b/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
new file mode 100644
index 000000000..a82d79fc6
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
@@ -0,0 +1,75 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2020 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.microsoft.graph.http.IRequestBuilder;
+import com.microsoft.graph.core.ClientException;
+import java.util.Arrays;
+import java.util.EnumSet;
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+
+/**
+ * The class for the Primitive Request Builder.
+ * @param <T> the primitive type to deserialize the response to
+ */
+public class PrimitiveRequestBuilder<T> extends BaseRequestBuilder<T> {
+
+    private final Class<T> _returnTypeClass;
+    /**
+     * The request builder for the primitive type
+     *
+     * @param requestUrl     the request URL
+     * @param client         the service client
+     * @param requestOptions the options for this request
+     * @param primitiveTypeClass the return type class for the request
+     */
+    public PrimitiveRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
+        super(requestUrl, client, requestOptions);
+        this._returnTypeClass = primitiveTypeClass;
+    }
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the PrimitiveRequest instance
+     */
+    @Nonnull
+    public PrimitiveRequest<T> buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
+    }
+
+    /**
+     * Creates the request with specific requestOptions instead of the existing requestOptions
+     *
+     * @param requestOptions the options for this request
+     * @return the PrimitiveRequest instance
+     */
+    @Nonnull
+    public PrimitiveRequest<T> buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
+        return new PrimitiveRequest<T>(getRequestUrl(), getClient(), requestOptions, this._returnTypeClass);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
new file mode 100644
index 000000000..6046c65b7
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
@@ -0,0 +1,102 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.http;
+
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.microsoft.graph.serializer.AdditionalDataManager;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.ISerializer;
+
+/** Represents the body to use with an OData method */
+public class ReferenceRequestBody implements IJsonBackedObject {
+
+    private AdditionalDataManager additionalDataManager = new AdditionalDataManager(this);
+
+    /** the odata id */
+    @SerializedName("@odata.id")
+    @Expose
+    @Nonnull
+    public String odataId;
+
+    /**
+     * The raw representation of this class
+     */
+    private JsonObject rawObject;
+
+    /**
+     * The serializer
+     */
+    private ISerializer serializer;
+
+    /**
+     * Instanciates a new reference request body from the serialized payload
+     * @param payload payload to instanciate the body from
+     */
+    public ReferenceRequestBody(@Nonnull final String payload) {
+        odataId = payload;
+    }
+
+    /**
+     * Gets the raw representation of this class
+     *
+     * @return the raw representation of this class
+     */
+    @Nullable
+    public JsonObject getRawObject() {
+        return rawObject;
+    }
+
+    /**
+     * Gets serializer
+     *
+     * @return the serializer
+     */
+    @Nullable
+    @Override
+    public ISerializer getSerializer() {
+        return serializer;
+    }
+
+    /**
+     * Sets the raw JSON object
+     *
+     * @param serializer the serializer
+     * @param json       the JSON object to set this object to
+     */
+    public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
+        this.serializer = serializer;
+        this.rawObject = json;
+    }
+
+    @Override
+    @Nonnull
+    public final AdditionalDataManager additionalDataManager() {
+        return additionalDataManager;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/logger/DefaultLogger.java b/src/main/java/com/microsoft/graph/logger/DefaultLogger.java
new file mode 100644
index 000000000..2b42b66e4
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/logger/DefaultLogger.java
@@ -0,0 +1,118 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.logger;
+
+import java.util.logging.Logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The default logger for the service client
+ */
+public class DefaultLogger implements ILogger {
+
+    /**
+     * The logging level
+     */
+    private LoggerLevel level = LoggerLevel.ERROR;
+    
+    private final static Logger LOGGER = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+
+    /**
+     * Sets the logging level of this logger
+     * 
+     * @param level the level to log at
+     */
+    public void setLoggingLevel(@Nonnull final LoggerLevel level) {
+    	LOGGER.info("Setting logging level to " + level);
+    	this.level = level;
+    }
+
+    /**
+     * Gets the logging level of this logger
+     * 
+     * @return the level the logger is set to
+     */
+    @Nonnull
+    public LoggerLevel getLoggingLevel() {
+        return level;
+    }
+
+    /**
+     * Creates the tag automatically
+     * 
+     * @return the tag for the current method
+     * Sourced from https://gist.github.com/eefret/a9c7ac052854a10a8936
+     */
+    @Nullable
+    private String getTag() {
+        try {
+            final StringBuilder sb = new StringBuilder();
+            final int callerStackDepth = 4;
+            final String className = Thread.currentThread().getStackTrace()[callerStackDepth].getClassName();
+            sb.append(className.substring(className.lastIndexOf('.') + 1));
+            sb.append("[");
+            sb.append(Thread.currentThread().getStackTrace()[callerStackDepth].getMethodName());
+            sb.append("] - ");
+            sb.append(Thread.currentThread().getStackTrace()[callerStackDepth].getLineNumber());
+            return sb.toString();
+        } catch (final Exception ex) {
+        	LOGGER.warning(ex.getMessage());
+        }
+        return null;
+    }
+
+    /**
+     * Logs a debug message
+     * 
+     * @param message the message
+     */
+    @Override
+    public void logDebug(@Nonnull final String message) {
+    	if(this.level == LoggerLevel.DEBUG)
+                for (final String line : message.split("\n")) {
+                	LOGGER.info(line);
+                }
+
+    }
+
+    /**
+     * Logs an error message with throwable
+     * 
+     * @param message   the message
+     * @param throwable the throwable
+     */
+    @Override
+    public void logError(@Nonnull final String message, @Nonnull final Throwable throwable) {
+        switch (level) {
+            case DEBUG:
+            case ERROR:
+            default:
+                for (final String line : message.split("\n")) {
+                	LOGGER.severe(getTag() + line);
+                }
+                LOGGER.severe("Throwable detail: " + throwable);
+        }
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/logger/ILogger.java b/src/main/java/com/microsoft/graph/logger/ILogger.java
new file mode 100644
index 000000000..59316cb9c
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/logger/ILogger.java
@@ -0,0 +1,63 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.logger;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The logger for the service client
+ */
+public interface ILogger {
+
+    /**
+     * Sets the logging level of this logger
+     * 
+     * @param level the level to log at
+     */
+    void setLoggingLevel(@Nonnull final LoggerLevel level);
+
+    /**
+     * Gets the logging level of this logger
+     * 
+     * @return the level the logger is set to
+     */
+    @Nonnull
+    LoggerLevel getLoggingLevel();
+
+    /**
+     * Log a debug message
+     * 
+     * @param message the message
+     */
+    void logDebug(@Nonnull final String message);
+
+    /**
+     * Log an error message with throwable
+     * 
+     * @param message   the message
+     * @param throwable the throwable
+     */
+    void logError(@Nonnull final String message, @Nullable final Throwable throwable);
+}
+
diff --git a/src/main/java/com/microsoft/graph/logger/LoggerLevel.java b/src/main/java/com/microsoft/graph/logger/LoggerLevel.java
new file mode 100644
index 000000000..4d39ae031
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/logger/LoggerLevel.java
@@ -0,0 +1,38 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.logger;
+
+/**
+ * Describes the logging levels supported by this client
+ */
+public enum LoggerLevel {
+    /**
+     * Log only errors, the default
+     */
+    ERROR,
+
+    /**
+     * Log debug information
+     */
+    DEBUG
+}
diff --git a/src/main/java/com/microsoft/graph/options/FunctionOption.java b/src/main/java/com/microsoft/graph/options/FunctionOption.java
new file mode 100644
index 000000000..d8939be23
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/options/FunctionOption.java
@@ -0,0 +1,39 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.options;
+
+import javax.annotation.Nonnull;
+
+/** Represents an option to use with OData methods */
+public class FunctionOption extends Option {
+
+    /**
+     * Creates an option object
+     *
+     * @param name  the name of the option
+     * @param value the value of the option
+     */
+    public FunctionOption(@Nonnull final String name, @Nonnull final Object value) {
+        super(name, value != null ? value : null);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/options/HeaderOption.java b/src/main/java/com/microsoft/graph/options/HeaderOption.java
new file mode 100644
index 000000000..b81e8fdee
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/options/HeaderOption.java
@@ -0,0 +1,42 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.options;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * A header value
+ */
+public class HeaderOption extends Option {
+
+    /**
+     * Creates a header option object
+     * 
+     * @param name  the name of the header
+     * @param value the value of the header
+     */
+    public HeaderOption(@Nonnull final String name, @Nonnull final String value) {
+        super(name, value);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
new file mode 100644
index 000000000..e661f3b1d
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/options/Option.java
@@ -0,0 +1,72 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.options;
+
+import javax.annotation.Nonnull;
+
+/**
+ * An option that is settable for a request
+ */
+public class Option {
+
+    /**
+     * The name of the option
+     */
+    private final String name;
+
+    /**
+     * The value of the option
+     */
+    private final Object value;
+
+    /**
+     * Creates an option object
+     * 
+     * @param name  the name of the option
+     * @param value the value of the option
+     */
+    protected Option(@Nonnull final String name, @Nonnull final Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    /**
+     * Gets the name of the option
+     * 
+     * @return the name of the option
+     */
+    @Nonnull
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the value of the option
+     * 
+     * @return the value of the option
+     */
+    @Nonnull
+    public Object getValue() {
+        return value;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/options/QueryOption.java b/src/main/java/com/microsoft/graph/options/QueryOption.java
new file mode 100644
index 000000000..ed34eb2b8
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/options/QueryOption.java
@@ -0,0 +1,40 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.options;
+
+import javax.annotation.Nonnull;
+/**
+ * A query parameter
+ */
+public class QueryOption extends Option {
+
+    /**
+     * Create a query parameter option object
+     * 
+     * @param name  the name of the query parameter
+     * @param value the value of the query parameter
+     */
+    public QueryOption(@Nonnull final String name, @Nonnull final Object value) {
+        super(name, value);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java b/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java
new file mode 100644
index 000000000..456721cdf
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/AdditionalDataManager.java
@@ -0,0 +1,97 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+/** Holds additional properties that are not part of the default object's schema */
+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) {
+        this.jsonBackedObject = jsonBackedObject;
+    }
+
+    /**
+     * Populates the additional data object with the raw JSON from the
+     * HTTP response
+     *
+     * @param json the raw JSON to set as additionalData
+     */
+    final void setAdditionalData(JsonObject json) {
+        // Get the names of all the fields on this object's hierarchy
+        Set<String> objectFields = getFields();
+
+        // Get the keys on this JSON
+        Set<String> jsonKeys = getJsonKeys(json);
+
+        // Get all keys present in JSON and *NOT* present in fields
+        Set<String> additionalDataKeys = new HashSet<>(jsonKeys);
+        additionalDataKeys.removeAll(objectFields);
+
+        // set the additionalData
+        for (String jsonKey : additionalDataKeys) {
+            put(jsonKey, json.get(jsonKey));
+        }
+    }
+
+    private Set<String> getJsonKeys(JsonObject json) {
+        Set<String> keys = new HashSet<>();
+        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());
+            }
+        }
+        return serializingFields;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java b/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java
new file mode 100644
index 000000000..f9eb3d4d9
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java
@@ -0,0 +1,65 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import com.google.common.io.BaseEncoding;
+
+import java.text.ParseException;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Serializer for byte[]s
+ */
+public final class ByteArraySerializer {
+
+    /**
+     * Not available for instantiation
+     */
+    private ByteArraySerializer() {
+    }
+
+    /**
+     * Deserializes a string
+     * 
+     * @param strVal          the value to deserialize
+     * @return                the string encoded bytes
+     * @throws ParseException if there is any problem processing the value
+     */
+    @Nullable
+    public static byte[] deserialize(@Nonnull final String strVal) throws ParseException {
+    	return BaseEncoding.base64().decode(strVal);
+    }
+
+    /**
+     * Serializes the string
+     *
+     * @param src the source array
+     * @return    the string
+     */
+    @Nullable
+    public static String serialize(@Nonnull final byte[] src) {
+        return BaseEncoding.base64().encode(src);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
new file mode 100644
index 000000000..fe7459edc
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -0,0 +1,153 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonParser;
+import com.google.common.reflect.TypeToken;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.http.IRequestBuilder;
+import com.microsoft.graph.logger.ILogger;
+
+/** Specialized serializer to handle collection pages */
+public class CollectionPageSerializer {
+
+	private static DefaultSerializer serializer;
+	/** length of the word "page" */
+	private final static Integer pageLength = 4;
+	/** length of the word "collection" */
+	private final static Integer collectionLength = 10;
+	/** length of the work "response" */
+	private final static Integer responseLength = 8;
+	/** the extensions segment in the package name of target classes */
+	private final static String extensionsPath = "extensions.";
+
+	/**
+	 * Not available for instantiation
+	 */
+	private CollectionPageSerializer() {
+	}
+
+	/**
+     * Serializes an CollectionPage
+     *
+     * @param src the CollectionPage variable for serialization
+     * @param logger the logger
+	 * @param <T1> the entity type for the collection
+	 * @param <T2> the collection request builder interface type
+     * @return       JsonElement of CollectionPage
+     */
+	@Nullable
+	public static <T1, T2 extends BaseRequestBuilder<T1>> JsonElement serialize(@Nonnull final BaseCollectionPage<T1, T2> src, @Nonnull final ILogger logger) {
+		if(src == null) {
+			return null;
+		}
+		JsonArray jsonArray = new JsonArray();
+		List<T1> items = src.getCurrentPage();
+		serializer = new DefaultSerializer(logger);
+		for(T1 item : items) {
+			final String json = serializer.serializeObject(item);
+			final JsonElement element = JsonParser.parseString(json);
+			if(element != null && element.isJsonObject()) {
+				final JsonObject jsonObject = element.getAsJsonObject();
+				jsonArray.add(jsonObject);
+			}
+		}
+		return jsonArray;
+	}
+
+	/**
+     * Deserializes the JsonElement
+     *
+     * @param json the source CollectionPage's Json
+   	 * @param typeOfT The type of the CollectionPage to deserialize to
+     * @param logger the logger
+	 * @param <T1> the entity type for the collection
+	 * @param <T2> the collection request builder interface type
+     * @throws JsonParseException the parse exception
+     * @return    the deserialized CollectionPage
+     */
+	@SuppressWarnings("unchecked")
+	@Nullable
+	public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2> deserialize(@Nonnull final JsonElement json, @Nonnull final Type typeOfT, @Nonnull final ILogger logger) throws JsonParseException {
+		if (json == null || !json.isJsonArray() || !typeOfT.getClass().equals(Class.class)) {
+			return null;
+		}
+		serializer = new DefaultSerializer(logger);
+		final JsonArray sourceArray = json.getAsJsonArray();
+		final ArrayList<T1> list = new ArrayList<T1>(sourceArray.size());
+		/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionPage */
+		final String collectionPageClassCanonicalName = ((Class<?>)typeOfT).getName();
+		/** eg: com.microsoft.graph.models.extensions.Attachment */
+		final String baseEntityClassCanonicalName = collectionPageClassCanonicalName
+					.substring(0, collectionPageClassCanonicalName.length() - pageLength - collectionLength)
+					.replace("requests", "models");
+		try {
+			final Class<?> baseEntityClass = Class.forName(baseEntityClassCanonicalName);
+			for(JsonElement sourceElement : sourceArray) {
+				if(sourceElement.isJsonObject()) {
+					final JsonObject sourceObject = sourceElement.getAsJsonObject();
+					Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
+					if(entityClass == null)
+						entityClass = baseEntityClass;
+					final T1 targetObject = (T1)serializer.deserializeObject(sourceObject.toString(), entityClass);
+					((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
+					list.add(targetObject);
+				}
+			}
+			/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionResponse */
+			final String responseClassCanonicalName = collectionPageClassCanonicalName
+						.substring(0, collectionPageClassCanonicalName.length() - pageLength) + "Response";
+			final Class<?> responseClass = Class.forName(responseClassCanonicalName);
+			final Object response = responseClass.getConstructor().newInstance();
+			responseClass.getField("value").set(response, list);
+			final Class<?> collectionPageClass = Class.forName(collectionPageClassCanonicalName);
+			/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionRequestBuilder */
+			final String responseBuilderCanonicalName = responseClassCanonicalName
+						.substring(0, responseClassCanonicalName.length() - responseLength)
+						.replace(extensionsPath, extensionsPath) + "RequestBuilder";
+			final Class<?> responseBuilderClass = Class.forName(responseBuilderCanonicalName);
+			return (BaseCollectionPage<T1, T2>)collectionPageClass.getConstructor(responseClass, responseBuilderClass).newInstance(response, null);
+		} catch(ClassNotFoundException ex) {
+			logger.logError("Could not find class during deserialization", ex);
+		} catch(NoSuchMethodException | InstantiationException | InvocationTargetException ex) {
+			logger.logError("Could not instanciate type during deserialization", ex);
+		} catch(NoSuchFieldException | IllegalAccessException ex) {
+			logger.logError("Unable to set field value during deserialization", ex);
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
new file mode 100644
index 000000000..cf0420a52
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -0,0 +1,384 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.CaseFormat;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.microsoft.graph.logger.ILogger;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * The default serializer implementation for the SDK
+ */
+public class DefaultSerializer implements ISerializer {
+
+	/**
+	 * The instance of the internal serializer
+	 */
+	private final Gson gson;
+
+	/**
+	 * The logger
+	 */
+	private final ILogger logger;
+
+	/**
+	 * Creates a DefaultSerializer
+	 *
+	 * @param logger the logger
+	 */
+	public DefaultSerializer(@Nonnull final ILogger logger) {
+		this.logger = logger;
+		this.gson = GsonFactory.getGsonInstance(logger);
+	}
+
+	/**
+	 * Deserializes an object from the input string
+	 *
+	 * @param inputString the string that stores the representation of the item
+	 * @param clazz	   the class of the item to be deserialized
+	 * @param <T>		 the type of the item to be deserialized
+	 * @return			the deserialized item from the input string
+	 */
+	@Override
+	@Nullable
+	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
+		return deserializeObject(inputString, clazz, null);
+	}
+	private static final String graphResponseHeadersKey = "graphResponseHeaders";
+	@SuppressWarnings("unchecked")
+	@Override
+	@Nullable
+	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, java.util.List<String>> responseHeaders) {
+		final T jsonObject = gson.fromJson(inputString, clazz);
+
+		// Populate the JSON-backed fields for any annotations that are not in the object model
+		if (jsonObject instanceof IJsonBackedObject) {
+			logger.logDebug("Deserializing type " + clazz.getSimpleName());
+			final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
+			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 = this.getDerivedClass(rawObject, clazz);
+				if(derivedClass != null)
+					jo = (T) gson.fromJson(inputString, derivedClass);
+			}
+
+			final IJsonBackedObject jsonBackedObject = (IJsonBackedObject) jo;
+			
+			if(rawElement.isJsonObject()) {
+				jsonBackedObject.setRawObject(this, rawObject);
+				jsonBackedObject.additionalDataManager().setAdditionalData(rawObject);
+				setChildAdditionalData(jsonBackedObject,rawObject);
+			}
+
+			if (responseHeaders != null) {
+				JsonElement convertedHeaders = gson.toJsonTree(responseHeaders);
+				jsonBackedObject.additionalDataManager().put(graphResponseHeadersKey, convertedHeaders);
+			}
+			return jo;
+		} else {
+			logger.logDebug("Deserializing a non-IJsonBackedObject type " + clazz.getSimpleName());
+			return jsonObject;
+		}
+	}
+
+	/**
+	 * Recursively sets additional data for each child object
+	 *
+	 * @param serializedObject   the parent object whose children will be iterated to set additional data
+	 * @param rawJson			the raw json
+	 */
+	private void setChildAdditionalData(final IJsonBackedObject serializedObject, final JsonObject rawJson) {
+		// Use reflection to iterate through fields for eligible Graph children
+		if(rawJson != null) {
+			for (java.lang.reflect.Field field : serializedObject.getClass().getFields()) {
+				try {
+					if(field != null) {
+						final Object fieldObject = field.get(serializedObject);
+						if (fieldObject instanceof HashMap) {
+							// If the object is a HashMap, iterate through its children
+							@SuppressWarnings("unchecked")
+							final HashMap<String, Object> serializableChildren = (HashMap<String, Object>) fieldObject;
+							final Iterator<Entry<String, Object>> it = serializableChildren.entrySet().iterator();
+
+							while (it.hasNext()) {
+								final Map.Entry<String, Object> pair = (Map.Entry<String, Object>)it.next();
+								final Object child = pair.getValue();
+
+								// If the item is a valid Graph object, set its additional data
+								if (child instanceof IJsonBackedObject) {
+									final AdditionalDataManager childAdditionalDataManager = ((IJsonBackedObject) child).additionalDataManager();
+									final JsonElement fieldElement = rawJson.get(field.getName());
+									if(fieldElement != null && fieldElement.isJsonObject() 
+											&& fieldElement.getAsJsonObject().get(pair.getKey()) != null
+											&& fieldElement.getAsJsonObject().get(pair.getKey()).isJsonObject()) {
+										childAdditionalDataManager.setAdditionalData(fieldElement.getAsJsonObject().get(pair.getKey()).getAsJsonObject());
+										setChildAdditionalData((IJsonBackedObject) child,fieldElement.getAsJsonObject().get(pair.getKey()).getAsJsonObject());
+									}
+								}
+							}
+						}
+						// If the object is a list of Graph objects, iterate through elements
+						else if (fieldObject instanceof List) {
+							final JsonElement collectionJson = rawJson.get(field.getName());
+							final List<?> fieldObjectList = (List<?>) fieldObject;
+							if (collectionJson != null && collectionJson.isJsonArray()) {
+								final JsonArray rawJsonArray = (JsonArray) collectionJson;
+								final Integer fieldObjectListSize = fieldObjectList.size();
+								final Integer rawJsonArraySize = rawJsonArray.size();
+								for (int i = 0; i < fieldObjectListSize && i < rawJsonArraySize; i++) {
+									final Object element = fieldObjectList.get(i);
+									if (element instanceof IJsonBackedObject) {
+										final JsonElement elementRawJson = rawJsonArray.get(i);
+										if(elementRawJson != null) {
+											setChildAdditionalData((IJsonBackedObject) element, elementRawJson.getAsJsonObject());
+										}
+									}
+								}
+								if (rawJsonArraySize != fieldObjectListSize) 
+									logger.logDebug("rawJsonArray has a size of " + rawJsonArraySize + " and fieldObjectList of " + fieldObjectListSize);
+							}
+						}
+						// If the object is a valid Graph object, set its additional data
+						else if (fieldObject instanceof IJsonBackedObject) {
+							final IJsonBackedObject serializedChild = (IJsonBackedObject) fieldObject;
+							final AdditionalDataManager childAdditionalDataManager = serializedChild.additionalDataManager();
+							final JsonElement fieldElement = rawJson.get(field.getName());
+							if(fieldElement != null && fieldElement.isJsonObject()) {
+								childAdditionalDataManager.setAdditionalData(fieldElement.getAsJsonObject());
+								setChildAdditionalData((IJsonBackedObject) fieldObject,fieldElement.getAsJsonObject());
+							}
+						}
+					}
+				} catch (IllegalArgumentException | IllegalAccessException e) {
+					//Not throwing the IllegalArgumentException as the Serialized Object would still be usable even if the additional data is not set.
+					logger.logError("Unable to set child fields of " + serializedObject.getClass().getSimpleName(), e);
+					logger.logDebug(rawJson.getAsString());
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Serializes an object into a string
+	 *
+	 * @param serializableObject the object to convert into a string
+	 * @param <T>				the type of the item to be serialized
+	 * @return 					 the string representation of that item
+	 */
+	@Override
+	@Nullable
+	public <T> String serializeObject(@Nonnull final T serializableObject) {
+		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;
+		}
+	}
+	
+	/**
+	 * 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 || field == 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);
+			}
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	private void addAdditionalDataFromJsonElementToJson (final Object item, final JsonElement itemJsonElement) {
+		if (item instanceof IJsonBackedObject && itemJsonElement.isJsonObject()) {
+			final JsonObject itemJsonObject = itemJsonElement.getAsJsonObject();
+			final IJsonBackedObject serializableItem = (IJsonBackedObject) item;
+			final AdditionalDataManager itemAdditionalData = serializableItem.additionalDataManager();
+			addAdditionalDataFromManagerToJson(itemAdditionalData, itemJsonObject);
+			getChildAdditionalData(serializableItem, itemJsonObject);
+		}
+	}
+
+	/**
+	 * Add each non-transient additional data property to the given JSON node
+	 * 
+	 * @param additionalDataManager the additional data bag to iterate through
+	 * @param jsonNode			  the JSON node to add the additional data properties to
+	 */
+	private void addAdditionalDataFromManagerToJson(AdditionalDataManager additionalDataManager, JsonObject jsonNode) {
+		for (Map.Entry<String, JsonElement> entry : additionalDataManager.entrySet()) {
+			if(!entry.getKey().equals(graphResponseHeadersKey)) {
+				jsonNode.add(entry.getKey(), entry.getValue());
+			}
+		}
+	}
+	
+	private final static String ODATA_TYPE_KEY = "@odata.type";
+	/**
+	 * Get the derived class for the given JSON object
+	 * This covers scenarios in which the service may return one of several derived types
+	 * of a base object, which it defines using the odata.type parameter
+	 * 
+	 * @param jsonObject  the raw JSON object of the response
+	 * @param parentClass the parent class the derived class should inherit from
+	 * @return			the derived class if found, or null if not applicable
+	 */
+	@Nullable
+	public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nonnull final Class<?> parentClass) {
+		//Identify the odata.type information if provided
+		if (jsonObject.get(ODATA_TYPE_KEY) != null) {
+			/** #microsoft.graph.user or #microsoft.graph.callrecords.callrecord */
+			final String odataType = jsonObject.get(ODATA_TYPE_KEY).getAsString();
+			final Integer lastDotIndex = odataType.lastIndexOf(".");
+			final String derivedType = (odataType.substring(0, lastDotIndex) + 
+											".models.extensions." + 
+											CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, 
+																		odataType.substring(lastDotIndex + 1)))
+										.replace("#", "com.");
+			try {
+				Class<?> derivedClass = Class.forName(derivedType);
+				//Check that the derived class inherits from the given parent class
+				if (parentClass.isAssignableFrom(derivedClass)) {
+					return derivedClass;
+				}
+				return null;
+			} catch (ClassNotFoundException e) {
+				logger.logDebug("Unable to find a corresponding class for derived type " + derivedType + ". Falling back to parent class.");
+				//If we cannot determine the derived type to cast to, return null
+				//This may happen if the API and the SDK are out of sync
+				return null;
+			}
+		}
+		//If there is no defined OData type, return null
+		return null;
+	}
+
+	/**
+	 * Gets the logger in use
+	 * 
+	 * @return a logger
+	 */
+	@VisibleForTesting
+	@Nullable
+	public ILogger getLogger() {
+		return logger;
+	}
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java b/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java
new file mode 100644
index 000000000..1e994f672
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java
@@ -0,0 +1,86 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+package com.microsoft.graph.serializer;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.logger.ILogger;
+
+import java.lang.reflect.Type;
+import java.util.EnumSet;
+import java.util.Iterator;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Serializes and deserializes EnumSets
+ * The Graph service expects a single enum value as a comma-delimited string
+ * Here, we flatten the EnumSet to serialize the object
+ * and insert the response into an array to deserialize back to an EnumSet
+ */
+public class EnumSetSerializer {
+
+    private final Gson gson;
+    /**
+     * Not available for instantiation
+     * @param logger logger to use during serialization
+     */
+    public EnumSetSerializer(@Nonnull final ILogger logger) {
+         gson = new GsonBuilder().registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger)).create();
+    }
+
+    /**
+     * Deserializes a comma-delimited string of enum values
+     *
+     * @param type                 the type
+     * @param jsonStrToDeserialize the string to deserialize
+     * @return                     EnumSet of values
+     */
+    @Nullable
+    public EnumSet<?> deserialize(@Nonnull final Type type, @Nonnull final String jsonStrToDeserialize) {
+            final String arrayString = "[" + jsonStrToDeserialize + "]";
+            return jsonStrToDeserialize == null ? null : (EnumSet<?>) gson.fromJson(arrayString, type);
+    }
+
+    /**
+     * Serializes an EnumSet into a comma-delimited string
+     *
+     * @param src the source EnumSet
+     * @return    a comma-delimited string of enum values
+     */
+    @Nullable
+    public JsonPrimitive serialize(@Nonnull final EnumSet<?> src) {
+        final StringBuilder serializedStringBuilder = new StringBuilder();
+
+        final Iterator<?> i = src.iterator();
+        while (i.hasNext()) {
+            final String jsonValue = gson.toJson(i.next());
+            serializedStringBuilder.append(jsonValue.substring(1, jsonValue.length() -1));
+            if(i.hasNext()) {
+                serializedStringBuilder.append(",");
+            }
+        }
+        return new JsonPrimitive(serializedStringBuilder.toString());
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java b/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java
new file mode 100644
index 000000000..13dfe7941
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java
@@ -0,0 +1,145 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.google.common.base.CaseFormat;
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import com.microsoft.graph.logger.ILogger;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Handles serialization/deserialization for special types (especially of 
+ * fields which are not caught by registering a type adapter).
+ */
+public final class FallbackTypeAdapterFactory implements TypeAdapterFactory {
+
+    /**
+     * The unexpected value constant
+     */
+    private static final String NO_KNOWN_VALUE = "unexpectedValue";
+
+    /**
+     * The logger instance
+     */
+    private final ILogger logger;
+    
+    /**
+     * Serializes an instance of Void (which is always null).
+     */
+    private static final TypeAdapter<Void> voidAdapter = new TypeAdapter<Void>() {
+
+        @Override
+        public void write(JsonWriter out, Void value) throws IOException {
+            out.nullValue();
+        }
+
+        @Override
+        public Void read(JsonReader in) throws IOException {
+            return null;
+        }
+        
+    };
+    
+    /**
+     * Instanciates a new type adapter factory
+     * 
+     * @param logger logger to use for the factory
+     */
+    public FallbackTypeAdapterFactory(@Nonnull final ILogger logger) {
+        this.logger = logger;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    @Nullable
+    public <T> TypeAdapter<T> create(@Nonnull final Gson gson, @Nonnull final TypeToken<T> type) {
+        final Class<T> rawType = (Class<T>) type.getRawType();
+        if (rawType.isEnum()) {
+            return new EnumTypeAdapter<T>(rawType, logger);
+        } else if (rawType == Void.class) {
+            return (TypeAdapter<T>) voidAdapter;
+        }
+        else {
+            return null;
+        }
+    }
+    
+    private static final class EnumTypeAdapter<T> extends TypeAdapter<T> {
+        
+        private final Map<String, T> enumValues;
+        private final ILogger logger;
+
+        EnumTypeAdapter(Class<T> cls, ILogger logger) {
+            super();
+            this.logger = logger;
+            final Map<String, T> enumValues = new HashMap<>();
+            for (T constant : cls.getEnumConstants()) {
+                enumValues.put(constant.toString(), constant);
+            }
+            this.enumValues = enumValues;
+        }
+        
+        @Override
+        public void write(final JsonWriter out, final T value) throws IOException {
+            if (value == null) {
+                out.nullValue();
+            } else {
+                out.value(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, value.toString()));
+            }
+        }
+
+        @Override
+        public T read(final JsonReader reader) throws IOException {
+            if (reader.peek() == JsonToken.NULL) {
+                reader.nextNull();
+                return null;
+            } else {
+                String value = reader.nextString();
+                T incoming = enumValues.get(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, value));
+                if (incoming == null) {
+                    logger.logDebug(
+                            String.format(
+                                    "The following value %s could not be recognized as a member of the enum",
+                                    value)
+                    );
+                    return enumValues.get(NO_KNOWN_VALUE);
+                }
+                return incoming;
+            }
+        }
+    }
+
+}
+
diff --git a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
new file mode 100644
index 000000000..af4d88b72
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
@@ -0,0 +1,267 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.core.DateOnly;
+
+import com.microsoft.graph.core.TimeOfDay;
+import java.lang.reflect.Type;
+import java.text.ParseException;
+import java.time.OffsetDateTime;
+import java.util.EnumSet;
+import java.util.GregorianCalendar;
+
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+
+/**
+ * Produce GSON instances that can parse HTTP responses
+ */
+final class GsonFactory {
+
+	protected static String PARSING_MESSAGE = "Parsing issue on ";
+
+    /**
+     * Default constructor
+     */
+    private GsonFactory() {
+    }
+
+    /**
+     * Creates an instance of GSON
+     *
+     * @param logger the logger
+     * @return the new instance
+     */
+    public static Gson getGsonInstance(final ILogger logger) {
+
+        final JsonSerializer<OffsetDateTime> calendarJsonSerializer = new JsonSerializer<OffsetDateTime>() {
+            @Override
+            public JsonElement serialize(final OffsetDateTime src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+                if (src == null) {
+                    return null;
+                }
+                try {
+                    return new JsonPrimitive(OffsetDateTimeSerializer.serialize(src));
+                } catch (final Exception e) {
+                    logger.logError(PARSING_MESSAGE + src, e);
+                    return null;
+                }
+            }
+        };
+
+        final JsonDeserializer<OffsetDateTime> calendarJsonDeserializer = new JsonDeserializer<OffsetDateTime>() {
+            @Override
+            public OffsetDateTime deserialize(final JsonElement json,
+                                        final Type typeOfT,
+                                        final JsonDeserializationContext context) throws JsonParseException {
+                if (json == null) {
+                    return null;
+                }
+                try {
+                    return OffsetDateTimeSerializer.deserialize(json.getAsString());
+                } catch (final ParseException e) {
+                    logger.logError(PARSING_MESSAGE + json.getAsString(), e);
+                    return null;
+                }
+            }
+        };
+
+        final JsonSerializer<byte[]> byteArrayJsonSerializer = new JsonSerializer<byte[]>() {
+            @Override
+            public JsonElement serialize(final byte[] src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+                if (src == null) {
+                    return null;
+                }
+                try {
+                    return new JsonPrimitive(ByteArraySerializer.serialize(src));
+                } catch (final Exception e) {
+                    logger.logError(PARSING_MESSAGE + src, e);
+                    return null;
+                }
+            }
+        };
+
+        final JsonDeserializer<byte[]> byteArrayJsonDeserializer = new JsonDeserializer<byte[]>() {
+            @Override
+            public byte[] deserialize(final JsonElement json,
+                                      final Type typeOfT,
+                                      final JsonDeserializationContext context) throws JsonParseException {
+                if (json == null) {
+                    return null;
+                }
+                try {
+                    return ByteArraySerializer.deserialize(json.getAsString());
+                } catch (final ParseException e) {
+                    logger.logError(PARSING_MESSAGE + json.getAsString(), e);
+                    return null;
+                }
+            }
+        };
+
+        final JsonSerializer<DateOnly> dateJsonSerializer = new JsonSerializer<DateOnly>() {
+            @Override
+            public JsonElement serialize(final DateOnly src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+                if (src == null) {
+                    return null;
+                }
+                return new JsonPrimitive(src.toString());
+            }
+        };
+
+        final JsonDeserializer<DateOnly> dateJsonDeserializer = new JsonDeserializer<DateOnly>() {
+            @Override
+            public DateOnly deserialize(final JsonElement json,
+                                        final Type typeOfT,
+                                        final JsonDeserializationContext context) throws JsonParseException {
+                if (json == null) {
+                    return null;
+                }
+
+                try {
+                    return DateOnly.parse(json.getAsString());
+                } catch (final ParseException e) {
+                    logger.logError(PARSING_MESSAGE + json.getAsString(), e);
+                    return null;
+                }
+            }
+        };
+        final EnumSetSerializer eSetSerializer = new EnumSetSerializer(logger);
+
+        final JsonSerializer<EnumSet<?>> enumSetJsonSerializer = new JsonSerializer<EnumSet<?>>() {
+            @Override
+            public JsonElement serialize(final EnumSet<?> src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+                if (src == null || src.isEmpty()) {
+                    return null;
+                }
+
+                return eSetSerializer.serialize(src);
+            }
+        };
+
+        final JsonDeserializer<EnumSet<?>> enumSetJsonDeserializer = new JsonDeserializer<EnumSet<?>>() {
+            @Override
+            public EnumSet<?> deserialize(final JsonElement json,
+                                        final Type typeOfT,
+                                        final JsonDeserializationContext context) throws JsonParseException {
+                if (json == null) {
+                    return null;
+                }
+
+                return eSetSerializer.deserialize(typeOfT, json.getAsString());
+            }
+        };
+
+        final JsonSerializer<Duration> durationJsonSerializer = new JsonSerializer<Duration>() {
+            @Override
+            public JsonElement serialize(final Duration src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+                return new JsonPrimitive(src.toString());
+            }
+        };
+
+        final JsonDeserializer<Duration> durationJsonDeserializer = new JsonDeserializer<Duration>() {
+            @Override
+            public Duration deserialize(final JsonElement json,
+                                       final Type typeOfT,
+                                       final JsonDeserializationContext context) throws JsonParseException {
+                try {
+                    return DatatypeFactory.newInstance().newDuration(json.getAsString());
+                } catch (Exception e) {
+                    return null;
+                }
+            }
+        };
+
+        final JsonSerializer<BaseCollectionPage<?, ?>> collectionPageSerializer = new JsonSerializer<BaseCollectionPage<?, ?>>() {
+            @Override
+            public JsonElement serialize(final BaseCollectionPage<?, ?> src,
+                                         final Type typeOfSrc,
+                                         final JsonSerializationContext context) {
+            	return CollectionPageSerializer.serialize(src, logger);
+            }
+        };
+
+        final JsonDeserializer<BaseCollectionPage<?, ?>> collectionPageDeserializer = new JsonDeserializer<BaseCollectionPage<?, ?>>() {
+            @Override
+            public BaseCollectionPage<?, ?> deserialize(final JsonElement json,
+                                        final Type typeOfT,
+                                        final JsonDeserializationContext context) throws JsonParseException {
+                return CollectionPageSerializer.deserialize(json, typeOfT, logger);
+            }
+        };
+
+        final JsonDeserializer<TimeOfDay> timeOfDayJsonDeserializer = new JsonDeserializer<TimeOfDay>() {
+            @Override
+            public TimeOfDay deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                try {
+                    return TimeOfDay.parse(json.getAsString());
+                } catch (Exception e) {
+                    return null;
+                }
+            }
+        };
+
+        return new GsonBuilder()
+                .excludeFieldsWithoutExposeAnnotation()
+                .registerTypeAdapter(OffsetDateTime.class, calendarJsonSerializer)
+                .registerTypeAdapter(OffsetDateTime.class, calendarJsonDeserializer)
+                .registerTypeAdapter(GregorianCalendar.class, calendarJsonSerializer)
+                .registerTypeAdapter(GregorianCalendar.class, calendarJsonDeserializer)
+                .registerTypeAdapter(byte[].class, byteArrayJsonDeserializer)
+                .registerTypeAdapter(byte[].class, byteArrayJsonSerializer)
+                .registerTypeAdapter(DateOnly.class, dateJsonSerializer)
+                .registerTypeAdapter(DateOnly.class, dateJsonDeserializer)
+                .registerTypeAdapter(EnumSet.class, enumSetJsonSerializer)
+                .registerTypeAdapter(EnumSet.class, enumSetJsonDeserializer)
+                .registerTypeAdapter(Duration.class, durationJsonSerializer)
+                .registerTypeAdapter(Duration.class, durationJsonDeserializer)
+                .registerTypeHierarchyAdapter(BaseCollectionPage.class, collectionPageSerializer)
+                .registerTypeHierarchyAdapter(BaseCollectionPage.class, collectionPageDeserializer)
+                .registerTypeAdapter(TimeOfDay.class, timeOfDayJsonDeserializer)
+                .registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger))
+                .create();
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java b/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java
new file mode 100644
index 000000000..b413e1237
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java
@@ -0,0 +1,67 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import com.google.gson.JsonObject;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * An object that was parsed from JSON
+ */
+public interface IJsonBackedObject {
+
+    /**
+     * Sets the raw JSON object this object was parsed from
+     *
+     * @param serializer the serializer for sub class deserialization
+     * @param json       the JSON that this object was derived from
+     */
+    void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json);
+
+    /**
+     * Provides access to objects not anticipated in the model, as well as 
+     * request and response data from the HTTP call
+     * 
+     * @return the AddtionalDataManager
+     */
+    @Nullable
+    AdditionalDataManager additionalDataManager();
+
+
+    /**
+     * Gets the raw JSON object for this object as parsed from
+     * @return the JSON that this object was derived from
+     */
+    @Nullable
+    JsonObject getRawObject();
+
+    /**
+     * Gets serializer
+     *
+     * @return the serializer
+     */
+    @Nullable
+    ISerializer getSerializer();
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
new file mode 100644
index 000000000..31e3d418f
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -0,0 +1,68 @@
+// ------------------------------------------------------------------------------
+// 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Serializes and deserializes items from strings into their types
+ */
+public interface ISerializer {
+
+    /**
+     * Deserialize an object from the input string
+     * 
+     * @param inputString the string that stores the representation of the item
+     * @param clazz       the .class of the item to be deserialized
+     * @param <T>         the type of the item to be deserialized
+     * @return            the deserialized item from the input string
+     */
+    @Nullable
+    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz);
+    
+    /**
+     * Deserialize an object from the input string
+     * 
+     * @param inputString     the string that stores the representation of the item
+     * @param clazz           the .class of the item to be deserialized
+     * @param responseHeaders the HTTP response headers
+     * @param <T>             the type of the item to be deserialized
+     * @return                the deserialized item from the input string
+     */
+    @Nullable
+    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
+
+    /**
+     * Serializes an object into a string
+     * 
+     * @param serializableObject the object to convert into a string
+     * @param <T>                the type of the item to be serialized
+     * @return                   the string representation of that item
+     */
+    @Nullable
+    <T> String serializeObject(@Nonnull final T serializableObject);
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java b/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java
new file mode 100644
index 000000000..aa55ec120
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java
@@ -0,0 +1,84 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.serializer;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.regex.Pattern;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
+import java.time.temporal.TemporalField;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+/**
+ * Serializes and deserializes a string
+ *
+ */
+public final class OffsetDateTimeSerializer {
+
+    /**
+     * Not available for instantiation
+     */
+    private OffsetDateTimeSerializer() {
+    }
+
+    /**
+     * Deserializes an ISO-8601 formatted date
+     *
+     * @param strVal the string value
+     * @return       the OffsetDateTime
+     * @throws java.text.ParseException the parse exception
+     */
+    @Nullable
+    public static OffsetDateTime deserialize(@Nonnull final String strVal) throws ParseException {
+        final String[] sections = strVal.split("T");
+        return OffsetDateTime.parse(missingColonPattern
+                                        .matcher((sections.length == 2 &&
+                                                    !sections[1].contains("+") &&
+                                                    !sections[1].contains("-") &&
+                                                    missingOffsetPattern.matcher(strVal).matches()) ?
+                                                            strVal + "Z": // adds a Z to 2019-06-21T17:12:35 only if we don't have a numeric offset
+                                                            strVal)
+                                        .replaceAll("$1$2:$3"),
+                                    DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+    }
+    private final static Pattern missingColonPattern = Pattern.compile("([-+])(\\d{2})(\\d{2})"); // + or - with 4 digits
+    private final static Pattern missingOffsetPattern = Pattern.compile(".*\\d{2}$"); //ends with 2 digits
+    /**
+     * Serializes the string
+     *
+     * @param src the source OffsetDateTime
+     * @return    the string
+     */
+    @Nonnull
+    public static String serialize(@Nonnull final OffsetDateTime src) {
+        return src.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+    }
+}

From a4cbf066407be7647068c1dcb737dd2e20158353 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 09:57:21 -0500
Subject: [PATCH 068/213] - adds missing guava reference

---
 gradle/dependencies.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index cbe89fb9b..5386dbe14 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -4,7 +4,7 @@ dependencies {
     
     api 'com.squareup.okhttp3:okhttp:4.9.0'
 
-    api 'com.google.code.findbugs:jsr305:3.0.2' // can be replaced by guava if we need guava
-    
+    implementation 'com.google.guava:guava:29.0-jre'
+
     implementation 'com.google.code.gson:gson:2.8.6'
 }
\ No newline at end of file

From 6c53fc3ee6257ad43e3a0d2035e59ece48900489 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 10:26:24 -0500
Subject: [PATCH 069/213] - adds mockito as dependency

---
 gradle/dependencies.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 5386dbe14..6e90b310d 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,6 +1,7 @@
 dependencies {
     // Use JUnit test framework
     testImplementation 'junit:junit:4.13.1'
+    testImplementation 'org.mockito:mockito-inline:3.6.0'
     
     api 'com.squareup.okhttp3:okhttp:4.9.0'
 

From b135d057af2644a85b6ac55b4181a7e9dc127e09 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 10:28:16 -0500
Subject: [PATCH 070/213] - moves core, logger and options tests to core repo

---
 .../microsoft/graph/core/BaseClientTests.java | 105 ++++++++++
 .../graph/core/ClientExceptionTests.java      |  29 +++
 .../graph/core/GraphServiceClientTest.java    | 183 ++++++++++++++++++
 .../microsoft/graph/core/MultipartTests.java  |  77 ++++++++
 .../graph/logger/DefaultLoggerTests.java      |  19 ++
 .../microsoft/graph/options/OptionTests.java  |  28 +++
 6 files changed, 441 insertions(+)
 create mode 100644 src/test/java/com/microsoft/graph/core/BaseClientTests.java
 create mode 100644 src/test/java/com/microsoft/graph/core/ClientExceptionTests.java
 create mode 100644 src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
 create mode 100644 src/test/java/com/microsoft/graph/core/MultipartTests.java
 create mode 100644 src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java
 create mode 100644 src/test/java/com/microsoft/graph/options/OptionTests.java

diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
new file mode 100644
index 000000000..a47bfa08f
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -0,0 +1,105 @@
+package com.microsoft.graph.core;
+
+import static org.mockito.Mockito.mock;
+
+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.OkHttpClient;
+
+import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * Test cases for {@see BaseClient}
+ */
+public class BaseClientTests {
+	public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
+    private String mEndpoint = DEFAULT_GRAPH_ENDPOINT;
+    private BaseClient baseClient;
+    private IHttpProvider mHttpProvider;
+    private ILogger mLogger;
+    private ISerializer mSerializer;
+
+	@Before
+	public void setUp() throws Exception {
+        baseClient = new BaseClient() {
+            @Override
+            public String getServiceRoot() {
+                return mEndpoint;
+            }
+
+            @Override
+            public void setServiceRoot(String value) {
+                mEndpoint = value;
+            }
+        };
+        mLogger = mock(ILogger.class);
+        mSerializer = mock(ISerializer.class);
+        mHttpProvider = new CoreHttpProvider(mSerializer,
+            mLogger,
+            new OkHttpClient.Builder().build());
+	}
+
+	@Test
+	public void testNotNull() {
+        assertNotNull(baseClient);
+        assertNotNull(mHttpProvider);
+        assertNotNull(mLogger);
+        assertNotNull(mSerializer);
+    }
+
+	@Test
+    public void testValidateThrowException() {
+        Boolean success = false;
+        try {
+            baseClient.validate();
+        }catch (NullPointerException nEx){
+            success = true;
+        }
+        assertTrue(success);
+    }
+
+	@Test
+    public void testValidateSuccess() throws Exception {
+        baseClient.setHttpProvider(mHttpProvider);
+        baseClient.setSerializer(mSerializer);
+        baseClient.validate();
+    }
+
+	@Test
+    public void testEndPoint() {
+        assertEquals(DEFAULT_GRAPH_ENDPOINT, baseClient.getServiceRoot());
+        String expectedServiceRoot = "https://foo.bar";
+        baseClient.setServiceRoot(expectedServiceRoot);
+        assertEquals(expectedServiceRoot, baseClient.getServiceRoot());
+    }
+
+	@Test
+    public void testHttpProvider() {
+        assertNull(baseClient.getHttpProvider());
+        baseClient.setHttpProvider(mHttpProvider);
+        assertEquals(mHttpProvider, baseClient.getHttpProvider());
+    }
+
+	public void testLogger() {
+        assertNull(baseClient.getLogger());
+        baseClient.setLogger(mLogger);
+        assertEquals(mLogger, baseClient.getLogger());
+    }
+
+    @Test
+    public void testSerializer() {
+        assertNull(baseClient.getSerializer());
+        baseClient.setSerializer(mSerializer);
+        assertEquals(mSerializer, baseClient.getSerializer());
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java b/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java
new file mode 100644
index 000000000..cc651a3c4
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java
@@ -0,0 +1,29 @@
+package com.microsoft.graph.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ClientExceptionTests {
+
+    private ClientException clientException;
+    private String expectMessage = "This is test exception message";
+	
+	@Before
+	public void setUp() throws Exception {
+        clientException = new ClientException(expectMessage, null);
+	}
+
+	@Test
+	public void testNotNull() {
+        assertNotNull(clientException);
+    }
+
+	@Test
+    public void testClientException() {
+        assertEquals(expectMessage, clientException.getMessage());
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
new file mode 100644
index 000000000..716f41fd0
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -0,0 +1,183 @@
+package com.microsoft.graph.core;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Test;
+
+import okhttp3.Request;
+
+import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.http.IHttpRequest;
+import com.microsoft.graph.http.IStatefulResponseHandler;
+import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.serializer.DefaultSerializer;
+import com.microsoft.graph.serializer.ISerializer;
+
+public class GraphServiceClientTest {
+    private ICoreAuthenticationProvider getAuthProvider() {
+        return new ICoreAuthenticationProvider() {
+            @Override
+            public Request authenticateRequest(Request request) {
+                return request;
+            }
+        };
+    }
+
+    @Test
+    public void testClientMethodsReturnStuff() {
+        ILogger logger = createLogger();
+        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+                .logger(logger)
+                .authenticationProvider(getAuthProvider())
+                .buildClient();
+        assertNotNull(client.getHttpProvider());
+        assertNotNull(client.getLogger());
+        assertNotNull(client.getSerializer());
+    }
+
+    @Test
+    public void testOverrideOfDefaultLogger() {
+        ILogger logger = createLogger();
+        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+                .logger(logger)
+                .authenticationProvider(getAuthProvider())
+                .buildClient();
+        assertNotNull(client.getHttpProvider());
+        assertNotNull(client.getLogger());
+        assertNotNull(client.getSerializer());
+        assertEquals(logger, ((CoreHttpProvider) client.getHttpProvider()).getLogger());
+        assertEquals(logger, ((DefaultSerializer) client.getSerializer()).getLogger());
+        assertEquals(logger, client.getLogger());
+    }
+
+    @Test
+    public void testOverrideOfDefaultAuthenticationProvider() {
+        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+                .authenticationProvider(getAuthProvider())
+                .buildClient();
+        assertNotNull(client.getHttpProvider());
+        assertNotNull(client.getLogger());
+        assertNotNull(client.getSerializer());
+    }
+
+    @Test
+    public void testOverrideOfSerializer() {
+        ISerializer serializer = new ISerializer() {
+
+            @Override
+            public <T> String serializeObject(T serializableObject) {
+                return null;
+            }
+
+            @Override
+            public <T> T deserializeObject(String inputString, Class<T> clazz,
+                    Map<String, List<String>> responseHeaders) {
+                return null;
+            }
+
+            @Override
+            public <T> T deserializeObject(String inputString, Class<T> clazz) {
+                return null;
+            }
+        };
+        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+                .serializer(serializer)
+                .authenticationProvider(getAuthProvider())
+                .buildClient();
+        assertEquals(serializer, client.getSerializer());
+        assertNotNull(client.getHttpProvider());
+        assertNotNull(client.getLogger());
+        assertEquals(serializer, ((CoreHttpProvider) client.getHttpProvider()).getSerializer());
+    }
+
+    @Test
+    public void testOverrideOfHttpSerializer() {
+        IHttpProvider hp = new IHttpProvider() {
+
+            @Override
+            public ISerializer getSerializer() {
+                return null;
+            }
+
+            @Override
+            public <Result, BodyType> java.util.concurrent.CompletableFuture<Result> futureSend(IHttpRequest request, Class<Result> resultClass, BodyType serializable) {
+                return null;
+            }
+
+            @Override
+            public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> futureSend(IHttpRequest request, Class<Result> resultClass, BodyType serializable, final IStatefulResponseHandler<Result, DeserializeType> handler) {
+                return null;
+            }
+
+            @Override
+            public <Result, BodyType> Result send(IHttpRequest request, Class<Result> resultClass,
+                    BodyType serializable) throws ClientException {
+                return null;
+            }
+
+            @Override
+            public <Result, BodyType, DeserializeType> Result send(IHttpRequest request,
+                    Class<Result> resultClass, BodyType serializable,
+                    IStatefulResponseHandler<Result, DeserializeType> handler)
+                    throws ClientException {
+                return null;
+            }
+
+			@Override
+			public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Result> resultClass,
+					BodyType serializable) throws ClientException {
+				return null;
+            }
+        };
+        IBaseGraphServiceClient client = BaseGraphServiceClient
+                .builder()
+                .httpProvider(hp)
+                .buildClient();
+        assertEquals(hp, client.getHttpProvider());
+        assertNotNull(client.getSerializer());
+        assertNotNull(client.getLogger());
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testHttpProviderCannotBeNull() {
+        BaseGraphServiceClient.builder().httpProvider(null);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testLoggerCannotBeNull() {
+        BaseGraphServiceClient.builder().logger(null);
+    }
+
+    private static ILogger createLogger() {
+        return new ILogger() {
+
+            @Override
+            public void setLoggingLevel(LoggerLevel level) {
+                // do nothing
+            }
+
+            @Override
+            public LoggerLevel getLoggingLevel() {
+                return LoggerLevel.DEBUG;
+            }
+
+            @Override
+            public void logDebug(String message) {
+                // do nothing
+            }
+
+            @Override
+            public void logError(String message, Throwable throwable) {
+                // do nothing
+            }
+        };
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/core/MultipartTests.java b/src/test/java/com/microsoft/graph/core/MultipartTests.java
new file mode 100644
index 000000000..bde13c30a
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/core/MultipartTests.java
@@ -0,0 +1,77 @@
+package com.microsoft.graph.core;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests for Multipart functionality
+ */
+@Ignore
+public class MultipartTests {
+	
+	private Multipart multipart;
+	
+	@Before
+    public void setUp() {
+		multipart =  new Multipart();
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithNameContenttypeFilename() {
+		String actual = multipart.createPartHeader("hamilton", "image/jpg", "hamilton.jpg");
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"; filename=\"hamilton.jpg\"\r\nContent-Type: image/jpg\r\n\r\n";
+        assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithContenttypeFilename() {
+		String actual = multipart.createPartHeader(null, "image/jpg", "hamilton.jpg");
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; filename=\"hamilton.jpg\"\r\nContent-Type: image/jpg\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithNameContenttype() {
+		String actual = multipart.createPartHeader("hamilton", "image/jpg", null);
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"\r\nContent-Type: image/jpg\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithContenttype() {
+		String actual = multipart.createPartHeader(null, "image/jpg", null);
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data\r\nContent-Type: image/jpg\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeader() {
+		String actual = multipart.createPartHeader(null, null, null);
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithNameFilename() {
+		String actual = multipart.createPartHeader("hamilton", null, "hamilton.jpg");
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"; filename=\"hamilton.jpg\"\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithName() {
+		String actual = multipart.createPartHeader("hamilton", null, null);
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+	
+	@Test
+	public void testCreatePartHeaderWithFilename() {
+		String actual = multipart.createPartHeader(null, null, "hamilton.jpg");
+		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; filename=\"hamilton.jpg\"\r\n\r\n";
+		assertEquals(expected, actual);
+	}
+}
diff --git a/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java b/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java
new file mode 100644
index 000000000..0e2e09539
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java
@@ -0,0 +1,19 @@
+package com.microsoft.graph.logger;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Test cases for {@see DefaultLogger}
+ */
+public class DefaultLoggerTests {
+
+	@Test
+    public void testLoggerLevel(){
+        ILogger logger = new DefaultLogger();
+        assertEquals(LoggerLevel.ERROR, logger.getLoggingLevel());
+        logger.setLoggingLevel(LoggerLevel.DEBUG);
+        assertEquals(LoggerLevel.DEBUG, logger.getLoggingLevel());
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/options/OptionTests.java b/src/test/java/com/microsoft/graph/options/OptionTests.java
new file mode 100644
index 000000000..1e4c65167
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/options/OptionTests.java
@@ -0,0 +1,28 @@
+package com.microsoft.graph.options;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class OptionTests {
+
+	@Test
+	public void testOption() {
+        FunctionOption functionOption = new FunctionOption("f1","fv1");
+        assertEquals("f1",functionOption.getName());
+        assertEquals("fv1",functionOption.getValue());
+
+        HeaderOption headerOption = new HeaderOption("h1","hv1");
+        assertEquals("h1",headerOption.getName());
+        assertEquals("hv1",headerOption.getValue());
+
+        QueryOption queryOption = new QueryOption("q1","qv1");
+        assertEquals("q1",queryOption.getName());
+        assertEquals("qv1",queryOption.getValue());
+
+        Option option = new Option("o1","ov1");
+        assertEquals("o1",option.getName());
+        assertEquals("ov1",option.getValue());
+    }
+
+}

From 4830b3b5272cd9c05893f57706498c693c7baabc Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 11:06:36 -0500
Subject: [PATCH 071/213] - fixes a bug where the authentication provider
 returning null would trip the request chain

---
 .../com/microsoft/graph/httpcore/AuthenticationHandler.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index c23395857..b033abb2d 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -42,7 +42,7 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
         originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 
         Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
-        return chain.proceed(authenticatedRequest);
+        return authenticatedRequest == null ? chain.proceed(originalRequest) : chain.proceed(authenticatedRequest);
     }
 
 }

From fc1dbc1a6a6666886b67fcf4e81059841500b401 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 11:07:21 -0500
Subject: [PATCH 072/213] - replaces usage of internal classes and manual mocks
 by proper mocking

---
 .../httpcore/AuthenticationHandlerTest.java   | 42 ++++++-------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index e79175c5d..27cf9b80d 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -3,43 +3,27 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.junit.Ignore;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
 import org.junit.Test;
 
+import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.internal.http.RealInterceptorChain;
+import okhttp3.Response;
 
-@Ignore
 public class AuthenticationHandlerTest {
-
-    static String token = "TEST-TOKEN";
-
-    public static class AuthProvider implements ICoreAuthenticationProvider{
-         public Request authenticateRequest(Request request) {
-             Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + token).build();
-             return newRequest;
-         }
-    }
-
     @Test
-    public void testAuthenticationHandler() {
-        AuthProvider authProvider = new AuthProvider();
+    public void testAuthenticationHandler() throws Exception {
+        ICoreAuthenticationProvider authProvider = mock(ICoreAuthenticationProvider.class);
         AuthenticationHandler authHandler = new AuthenticationHandler(authProvider);
         Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
-
-        RealInterceptorChain chain = new RealInterceptorChain(null, null, 0, null, request, 0, 0, 0);
-
-        try {
-            authHandler.intercept(chain);
-
-            String value = request.header("Authorization");
-            assertTrue(value.equals("Bearer " + token));
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            fail("Authentication handler failure");
-        }
+        OkHttpClient client = new OkHttpClient().newBuilder().addInterceptor(authHandler).build();
+        Response response = client.newCall(request).execute();
+        verify(authProvider, times(1)).authenticateRequest(anyObject());
     }
 
 }

From baf95e551e39a53bd5b874501909325c71eb578e Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 11:07:43 -0500
Subject: [PATCH 073/213] - enables wrongfully disabled test

---
 .../microsoft/graph/core/MultipartTests.java  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/core/MultipartTests.java b/src/test/java/com/microsoft/graph/core/MultipartTests.java
index bde13c30a..a1bdacad1 100644
--- a/src/test/java/com/microsoft/graph/core/MultipartTests.java
+++ b/src/test/java/com/microsoft/graph/core/MultipartTests.java
@@ -3,71 +3,69 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Tests for Multipart functionality
  */
-@Ignore
 public class MultipartTests {
-	
+
 	private Multipart multipart;
-	
+
 	@Before
     public void setUp() {
 		multipart =  new Multipart();
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithNameContenttypeFilename() {
 		String actual = multipart.createPartHeader("hamilton", "image/jpg", "hamilton.jpg");
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"; filename=\"hamilton.jpg\"\r\nContent-Type: image/jpg\r\n\r\n";
         assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithContenttypeFilename() {
 		String actual = multipart.createPartHeader(null, "image/jpg", "hamilton.jpg");
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; filename=\"hamilton.jpg\"\r\nContent-Type: image/jpg\r\n\r\n";
 		assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithNameContenttype() {
 		String actual = multipart.createPartHeader("hamilton", "image/jpg", null);
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"\r\nContent-Type: image/jpg\r\n\r\n";
 		assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithContenttype() {
 		String actual = multipart.createPartHeader(null, "image/jpg", null);
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data\r\nContent-Type: image/jpg\r\n\r\n";
 		assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeader() {
 		String actual = multipart.createPartHeader(null, null, null);
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data\r\n\r\n";
 		assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithNameFilename() {
 		String actual = multipart.createPartHeader("hamilton", null, "hamilton.jpg");
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"; filename=\"hamilton.jpg\"\r\n\r\n";
 		assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithName() {
 		String actual = multipart.createPartHeader("hamilton", null, null);
 		String expected = "--"+multipart.getBoundary()+"\r\nContent-Disposition: form-data; name=\"hamilton\"\r\n\r\n";
 		assertEquals(expected, actual);
 	}
-	
+
 	@Test
 	public void testCreatePartHeaderWithFilename() {
 		String actual = multipart.createPartHeader(null, null, "hamilton.jpg");

From 519fe80b8622cc7fabd54999149503733480a2d0 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 11:08:33 -0500
Subject: [PATCH 074/213] - moves part of the serializer tests

---
 .../serializer/ByteArraySerializerTests.java  |  24 +++
 .../graph/serializer/DateOnlyTests.java       |  39 ++++
 .../graph/serializer/DurationTests.java       |  28 +++
 .../graph/serializer/ISO8601Test.java         |  47 +++++
 .../OffsetDateTimeSerializerTests.java        | 198 ++++++++++++++++++
 .../graph/serializer/TimeOfDayTests.java      |  47 +++++
 6 files changed, 383 insertions(+)
 create mode 100644 src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java
 create mode 100644 src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java
 create mode 100644 src/test/java/com/microsoft/graph/serializer/DurationTests.java
 create mode 100644 src/test/java/com/microsoft/graph/serializer/ISO8601Test.java
 create mode 100644 src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java
 create mode 100644 src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java

diff --git a/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java b/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java
new file mode 100644
index 000000000..75909dceb
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java
@@ -0,0 +1,24 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Test;
+
+public class ByteArraySerializerTests {
+
+	@Test
+	public void testByteSerialization() throws Exception {
+        String expectedString = "abcd";
+        String serializeString = ByteArraySerializer.serialize(new byte[]{105,-73,29});
+        assertEquals(expectedString, serializeString);
+        assertFalse(ByteArraySerializer.serialize(new byte[]{1,2,3}).equals(ByteArraySerializer.serialize(new byte[]{1,2,3,4})));
+    }
+
+	@Test
+    public void testStringDeserialization() throws Exception {
+        byte[] deserializeBytes = ByteArraySerializer.deserialize("abcd");
+        assertEquals(3, deserializeBytes.length);
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java b/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java
new file mode 100644
index 000000000..3030d4253
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java
@@ -0,0 +1,39 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.microsoft.graph.core.DateOnly;
+
+public class DateOnlyTests {
+
+	@Test
+	public void testDateSerializer() throws Exception {
+        String strDate = DateOnly.parse("2016-04-27").toString();
+        assertEquals("2016-04-27", strDate);
+    }
+
+	@Test
+    public void testDateSerializerIndefinite() throws Exception {
+        String strDate = DateOnly.parse("0001-01-01").toString();
+        assertEquals("0001-01-01", strDate);
+    }
+
+	@Test
+    public void testDateDeserializer() throws Exception {
+        DateOnly date = DateOnly.parse("2016-04-27");
+        assertEquals(2016, date.getYear());
+        assertEquals(4, date.getMonth());
+        assertEquals(27, date.getDay());
+    }
+
+	@Test
+    public void testDateDeserializerIndefinite() throws Exception{
+        DateOnly date = DateOnly.parse("0001-01-01");
+        assertEquals(1, date.getYear());
+        assertEquals(1, date.getMonth());
+        assertEquals(1, date.getDay());
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/serializer/DurationTests.java b/src/test/java/com/microsoft/graph/serializer/DurationTests.java
new file mode 100644
index 000000000..a6d553b17
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/DurationTests.java
@@ -0,0 +1,28 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+
+import org.junit.Test;
+
+public class DurationTests {
+
+	@Test
+	public void testDurationSerializer() throws Exception {
+        String strDuration = DatatypeFactory.newInstance().newDurationDayTime(true, 0, 2, 30, 0).toString();
+        assertEquals("P0DT2H30M0S", strDuration);
+    }
+
+	@Test
+    public void testDurationDeserializer() throws Exception {
+        Duration duration = DatatypeFactory.newInstance().newDurationDayTime(true, 0, 1, 30, 45);
+        assertEquals(0, duration.getMonths());
+        assertEquals(0, duration.getDays());
+        assertEquals(1, duration.getHours());
+        assertEquals(30, duration.getMinutes());
+        assertEquals(45, duration.getSeconds());
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java b/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java
new file mode 100644
index 000000000..738f8c614
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java
@@ -0,0 +1,47 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.Date;
+import java.util.TimeZone;
+
+import org.junit.Test;
+
+public class ISO8601Test {
+
+	/**
+     * Make sure that dates with and without millis can be converted properly into strings
+     * @throws Exception If there is an exception during the test
+     */
+	@Test
+    public void testFromDate() throws Exception {
+        TimeZone.setDefault(TimeZone.getTimeZone("PST"));
+        final OffsetDateTime date = OffsetDateTime.of(5882, 3, 11, 00, 30, 12, 345000000, ZoneOffset.UTC);
+        assertEquals("5882-03-11T00:30:12.345Z", OffsetDateTimeSerializer.serialize(date));
+
+        final OffsetDateTime dateNoMillis = OffsetDateTime.of(5882, 3, 11, 00, 30, 12, 0, ZoneOffset.UTC);
+        assertEquals("5882-03-11T00:30:12Z", OffsetDateTimeSerializer.serialize(dateNoMillis));
+    }
+
+    /**
+     * Make sure that dates in string format with and without millis can be converted properly into date objects
+     * @throws Exception If there is an exception during the test
+     */
+	@Test
+    public void testToDate() throws Exception {
+        TimeZone.setDefault(TimeZone.getTimeZone("PST"));
+        final long toTheSecondDate = 123456789012L;
+        final OffsetDateTime dateToSecond = OffsetDateTimeSerializer.deserialize("5882-03-11T00:30:12Z");
+        assertEquals(toTheSecondDate, dateToSecond.toInstant().getEpochSecond());
+
+        final OffsetDateTime dateToTheMillisecond = OffsetDateTimeSerializer.deserialize("5882-03-11T00:30:12.345Z");
+        assertEquals(toTheSecondDate, dateToTheMillisecond.toInstant().getEpochSecond());
+        assertEquals(345000000, dateToTheMillisecond.toInstant().getNano());
+
+        final OffsetDateTime dateToTheExtremeMillisecond = OffsetDateTimeSerializer.deserialize("5882-03-11T00:30:12.3456789Z");
+        assertEquals(toTheSecondDate, dateToTheExtremeMillisecond.toInstant().getEpochSecond());
+        assertEquals(345678900, dateToTheExtremeMillisecond.toInstant().getNano());
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java b/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java
new file mode 100644
index 000000000..e1bdcfd54
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java
@@ -0,0 +1,198 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.time.Instant;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.TimeZone;
+
+import org.junit.Test;
+
+/**
+ * Test cases for offsetDateTime serialization and deserialization
+ *
+ * @author mobilal
+ *
+ */
+public class OffsetDateTimeSerializerTests {
+
+	/**
+	 * Validate if a offsetDateTime date instance could be serialized
+	 * @throws Exception if offsetDateTime couldn't be serialized
+	 */
+	@Test
+	public void testDateSerialization() throws Exception {
+        final OffsetDateTime offsetDateTime = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561162355000L), ZoneOffset.UTC);
+		final String expected = "2019-06-22T00:12:35Z";
+		final String actual = OffsetDateTimeSerializer.serialize(offsetDateTime);
+		assertNotNull(actual);
+		assertEquals(expected, actual);
+	}
+
+	/**
+	 * Validate if a date without milliseconds and offset could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testSimpleDateTimeDeserialization() throws Exception {
+
+		final String datetime = "2019-06-21T17:12:35";
+		final TimeZone defaultTimeZone = TimeZone.getDefault();
+
+		// Set timezone to UTC for testing
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561137155000L), ZoneOffset.UTC);
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+
+		// Reset timezone after testing
+		TimeZone.setDefault(defaultTimeZone);
+	}
+
+	/**
+	 * Validate if date with UTC timezone (z) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCSimpleDateTimeDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35Z";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561137155000L), ZoneOffset.UTC);
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with UTC timezone (z) and milliseconds could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCDateTimeWithMillisDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35.1385912Z";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561137155138L), ZoneOffset.UTC);
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with UTC offset (+00:00) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCDateTimeInOffsetFormatDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35+00:00";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561137155000L), ZoneOffset.UTC);
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with UTC offset (+00:00) and milliseconds could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCDateTimeWithMillisAndOffsetDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35.1385912+00:00";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561137155138L), ZoneOffset.UTC);
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with different UTC offset (+0000) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCDateTimeInNonstandardOffsetFormatDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35+0000";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561137155000L), ZoneOffset.UTC);
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with positive timezone offset (+07:00) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testDateTimePositiveOffsetFormatDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35+07:00";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561111955000L), ZoneOffset.ofHours(7));
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with positive timezone offset (+07:00) and milliseconds could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testDateTimeWithMillisAndPositiveOffsetDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35.1385912+07:00";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561111955138L), ZoneOffset.ofHours(7));
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with positive timezone offset in different format (+0700) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCDateTimeInNonstandardPositiveOffsetFormatDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35+0700";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561111955000L), ZoneOffset.ofHours(7));
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with negative timezone offset (-07:00) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testDateTimeNegativeOffsetFormatDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35-07:00";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561162355000L), ZoneOffset.ofHours(-7));
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with negative timezone offset (-07:00) and milliseconds could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testDateTimeWithMillisAndNegativeOffsetDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35.1385912-07:00";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561162355138L), ZoneOffset.ofHours(-7));
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+	/**
+	 * Validate if date with negative timezone offset in different format (-0700) could be deserialized
+	 * @throws Exception if date is not parsable
+	 */
+	@Test
+	public void testUTCDateTimeInNonstandardNegativeOffsetFormatDeserialization() throws Exception {
+		final String datetime = "2019-06-21T17:12:35-0700";
+        final OffsetDateTime expected = OffsetDateTime.ofInstant(Instant.ofEpochMilli(1561162355000L), ZoneOffset.ofHours(-7));
+		final OffsetDateTime actual = OffsetDateTimeSerializer.deserialize(datetime);
+		assertNotNull(actual);
+		assertEquals(expected.toInstant().getEpochSecond(), actual.toInstant().getEpochSecond());
+	}
+
+}
diff --git a/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java b/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java
new file mode 100644
index 000000000..35ccf0f5e
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java
@@ -0,0 +1,47 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.microsoft.graph.core.TimeOfDay;
+
+public class TimeOfDayTests {
+
+	@Test
+	public void testTimeOfDaySerializer() throws Exception {
+        String strDate = TimeOfDay.parse("12:30:44").toString();
+        assertEquals("12:30:44", strDate);
+    }
+
+	@Test
+    public void testTimeOfDaySerializerIndefinite() throws Exception {
+        String strDate = TimeOfDay.parse("01:01:01").toString();
+        assertEquals("01:01:01", strDate);
+    }
+
+	@Test
+    public void testTimeOfDayDeserializer() throws Exception {
+        TimeOfDay time = TimeOfDay.parse("12:30:44");
+        assertEquals(12, time.getHour());
+        assertEquals(30, time.getMinute());
+        assertEquals(44, time.getSecond());
+    }
+
+	@Test
+    public void testTimeOfDayDeserializerIndefinite() throws Exception{
+        TimeOfDay time = TimeOfDay.parse("01:01:01");
+        assertEquals(1, time.getHour());
+        assertEquals(1, time.getMinute());
+        assertEquals(1, time.getSecond());
+    }
+
+    @Test
+    public void testTimeOfDayDeserializerWithFraction() throws Exception{
+        TimeOfDay time = TimeOfDay.parse("12:30:44.0000000");
+        assertEquals(12, time.getHour());
+        assertEquals(30, time.getMinute());
+        assertEquals(44, time.getSecond());
+    }
+
+}

From db1fce88a8c98ce5e2b1e6aef0d2953213116378 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 11:15:25 -0500
Subject: [PATCH 075/213] - adds missing legal text for IUploadsession

---
 .../graph/concurrency/IUploadSession.java     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java b/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
index f19e38670..49e36e220 100644
--- a/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
+++ b/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
@@ -1,3 +1,25 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
 package com.microsoft.graph.concurrency;
 
 import java.util.List;

From 7b7458a5838351a28eed2b5ec253fa9d04658128 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 11:23:03 -0500
Subject: [PATCH 076/213] - brings options tests to 100%

---
 .../graph/options/FunctionOption.java         |  8 +++----
 .../com/microsoft/graph/options/Option.java   | 18 ++++++++++------
 .../microsoft/graph/options/OptionTests.java  | 21 +++++++++++++++++++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/options/FunctionOption.java b/src/main/java/com/microsoft/graph/options/FunctionOption.java
index d8939be23..95c7de873 100644
--- a/src/main/java/com/microsoft/graph/options/FunctionOption.java
+++ b/src/main/java/com/microsoft/graph/options/FunctionOption.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
@@ -34,6 +34,6 @@ public class FunctionOption extends Option {
      * @param value the value of the option
      */
     public FunctionOption(@Nonnull final String name, @Nonnull final Object value) {
-        super(name, value != null ? value : null);
+        super(name, value);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
index e661f3b1d..3376529c2 100644
--- a/src/main/java/com/microsoft/graph/options/Option.java
+++ b/src/main/java/com/microsoft/graph/options/Option.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
@@ -41,18 +41,24 @@ public class Option {
 
     /**
      * Creates an option object
-     * 
+     *
      * @param name  the name of the option
      * @param value the value of the option
      */
     protected Option(@Nonnull final String name, @Nonnull final Object value) {
+        if(name == null || name == "") {
+            throw new IllegalArgumentException("name should not be null or empty");
+        }
+        if(value == null) {
+            throw new IllegalArgumentException("value should not be null");
+        }
         this.name = name;
         this.value = value;
     }
 
     /**
      * Gets the name of the option
-     * 
+     *
      * @return the name of the option
      */
     @Nonnull
@@ -62,7 +68,7 @@ public String getName() {
 
     /**
      * Gets the value of the option
-     * 
+     *
      * @return the value of the option
      */
     @Nonnull
diff --git a/src/test/java/com/microsoft/graph/options/OptionTests.java b/src/test/java/com/microsoft/graph/options/OptionTests.java
index 1e4c65167..91ab15c2f 100644
--- a/src/test/java/com/microsoft/graph/options/OptionTests.java
+++ b/src/test/java/com/microsoft/graph/options/OptionTests.java
@@ -1,6 +1,8 @@
 package com.microsoft.graph.options;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
@@ -23,6 +25,25 @@ public void testOption() {
         Option option = new Option("o1","ov1");
         assertEquals("o1",option.getName());
         assertEquals("ov1",option.getValue());
+
+        try {
+            new Option(null, "onion");
+            fail("should fail on null name");
+        } catch(Exception ex) {
+            assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
+        }
+        try {
+            new Option("", "onion");
+            fail("should fail on empty name");
+        } catch(Exception ex) {
+            assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
+        }
+        try {
+            new Option("onion", null);
+            fail("should fail on null value");
+        } catch(Exception ex) {
+            assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
+        }
     }
 
 }

From c5a1260c33f8b982f477140f05eb68213a545baa Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 12:35:44 -0500
Subject: [PATCH 077/213] - reverts defensive programming on option value as
 null values are valid

---
 src/main/java/com/microsoft/graph/options/Option.java      | 3 ---
 src/test/java/com/microsoft/graph/options/OptionTests.java | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
index 3376529c2..c0f7a7c30 100644
--- a/src/main/java/com/microsoft/graph/options/Option.java
+++ b/src/main/java/com/microsoft/graph/options/Option.java
@@ -49,9 +49,6 @@ protected Option(@Nonnull final String name, @Nonnull final Object value) {
         if(name == null || name == "") {
             throw new IllegalArgumentException("name should not be null or empty");
         }
-        if(value == null) {
-            throw new IllegalArgumentException("value should not be null");
-        }
         this.name = name;
         this.value = value;
     }
diff --git a/src/test/java/com/microsoft/graph/options/OptionTests.java b/src/test/java/com/microsoft/graph/options/OptionTests.java
index 91ab15c2f..101a942f3 100644
--- a/src/test/java/com/microsoft/graph/options/OptionTests.java
+++ b/src/test/java/com/microsoft/graph/options/OptionTests.java
@@ -38,12 +38,6 @@ public void testOption() {
         } catch(Exception ex) {
             assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
         }
-        try {
-            new Option("onion", null);
-            fail("should fail on null value");
-        } catch(Exception ex) {
-            assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
-        }
     }
 
 }

From 0673a8fea6580f25ce72f10e92c578a3c167d5d0 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 12:36:35 -0500
Subject: [PATCH 078/213] - moves some of the request tests

---
 .../graph/http/BaseCollectionPageTests.java   |  76 ++++++++
 .../graph/http/BaseRequestBuilderTests.java   |  34 ++++
 .../graph/http/BaseRequestTests.java          | 148 ++++++++++++++++
 .../graph/http/BaseStreamRequestTests.java    | 166 ++++++++++++++++++
 4 files changed, 424 insertions(+)
 create mode 100644 src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/BaseRequestTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java

diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
new file mode 100644
index 000000000..919165060
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
@@ -0,0 +1,76 @@
+package com.microsoft.graph.http;
+
+import static org.mockito.Mockito.mock;
+
+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 java.util.ArrayList;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.google.gson.JsonObject;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * Test cases for {@see BaseCollectionPage}
+ */
+public class BaseCollectionPageTests {
+
+    private BaseRequestBuilder<String> mRequestBuilder;
+    private static ArrayList<String> list;
+    private BaseCollectionPage<String, BaseRequestBuilder<String>> baseCollectionPage;
+    private String requestUrl = "https://a.b.c/";
+
+    @Before
+    public void setUp() throws Exception {
+        list = new ArrayList<String>();
+        list.add("Object1");
+        list.add("Object2");
+        list.add("Object3");
+        IBaseClient mBaseClient = mock(IBaseClient.class);
+        mRequestBuilder = new BaseRequestBuilder<String>(requestUrl, mBaseClient, null) {};
+        baseCollectionPage = new BaseCollectionPage<String, BaseRequestBuilder<String>>(list, mRequestBuilder) {};
+    }
+
+    @Test
+    public void testNotNull() {
+        assertNotNull(baseCollectionPage);
+    }
+
+    @Test
+    public void testCurrentPage() {
+        assertEquals(3,baseCollectionPage.getCurrentPage().size());
+        assertEquals("Object2", baseCollectionPage.getCurrentPage().get(1));
+        Boolean success = false;
+        try{
+            baseCollectionPage.getCurrentPage().remove(1);
+        }catch (UnsupportedOperationException uEx){
+            success = true;
+        }
+        assertTrue(success);
+    }
+
+    @Test
+    public void testNextPage() {
+        assertEquals(mRequestBuilder, baseCollectionPage.getNextPage());
+    }
+
+    @Test
+    public void testRawObject() {
+        ISerializer serializer = mock(ISerializer.class);
+        JsonObject jsonObject = new JsonObject();
+        assertNull(baseCollectionPage.getRawObject());
+        assertNull(baseCollectionPage.getSerializer());
+        baseCollectionPage.setRawObject(serializer,jsonObject);
+        assertNotNull(baseCollectionPage.getRawObject());
+        assertNotNull(baseCollectionPage.getSerializer());
+        assertEquals(serializer, baseCollectionPage.getSerializer());
+        assertEquals(jsonObject, baseCollectionPage.getRawObject());
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
new file mode 100644
index 000000000..6f7bb83df
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
@@ -0,0 +1,34 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test cases for {@see BaseRequestBuilder}
+ */
+public class BaseRequestBuilderTests {
+
+    private String expectedRequestUrl = "https://a.b.c/";
+    private BaseRequestBuilder<String> baseRequestBuilder;
+
+    @Before
+    public void setUp() throws Exception {
+        baseRequestBuilder = new BaseRequestBuilder<String>(expectedRequestUrl,null,null){};
+    }
+
+    @Test
+    public void testNotNull() {
+        assertNotNull(baseRequestBuilder);
+    }
+
+    @Test
+    public void testRequestUrlAndOptions() {
+        assertEquals(expectedRequestUrl, baseRequestBuilder.getRequestUrl());
+        assertEquals(0, baseRequestBuilder.getOptions().size());
+        assertEquals(expectedRequestUrl+"/d", baseRequestBuilder.getRequestUrlWithAdditionalSegment("d"));
+        assertEquals(expectedRequestUrl + "('version=1.0')", baseRequestBuilder.getRequestUrlWithAdditionalParameter("version=1.0"));
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
new file mode 100644
index 000000000..b767d13f2
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -0,0 +1,148 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.mockito.Mockito.mock;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.core.BaseGraphServiceClient;
+
+/**
+ * Test cases for {@see BaseRequest}
+ */
+public class BaseRequestTests {
+    private IBaseGraphServiceClient mBaseClient;
+    private BaseRequest<JsonObject> mRequest;
+    private JsonObject callbackJsonObject;
+
+    @Before
+    public void setUp() throws Exception {
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(200).message("OK").body(
+                   ResponseBody.create(MediaType.parse("application/json"),
+                        "{ \"id\": \"zzz\" }"
+                ))
+                .addHeader("Content-Type", "application/json")
+                .build();
+        final OkHttpClient mockClient = BaseStreamRequestTests.getMockClient(response);
+        final JsonObject result = new JsonObject();
+        result.add("id", new JsonPrimitive("zzz"));
+        mBaseClient = BaseGraphServiceClient.builder()
+                .httpClient(mockClient)
+                .buildClient();
+        mRequest = new BaseRequest<JsonObject>("https://a.b.c/", mBaseClient, null,JsonObject.class){};
+    }
+
+    @Test
+    public void testSend() {
+        final JsonObject result = mRequest.send(HttpMethod.GET, null);
+        assertNotNull(result);
+        assertEquals("zzz", result.get("id").getAsString());
+    }
+
+    @Test
+    public void testSendWithCallback() throws InterruptedException, ExecutionException {
+        final java.util.concurrent.CompletableFuture<JsonObject> result = mRequest.futureSend(HttpMethod.GET, null);
+        assertNotNull(result.get());
+        assertTrue(result.isDone());
+        assertFalse(result.isCancelled());
+        assertEquals("zzz", result.get().get("id").getAsString());
+    }
+
+    @Test
+    public void testFunctionParameters() {
+        final Option fo1 = new FunctionOption("1", "one");
+        final Option fo2 = new FunctionOption("2", null);
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(fo1, fo2), null){};
+        assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
+        request.addFunctionOption(new FunctionOption("3","two"));;
+        assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
+        assertEquals(4, request.getOptions().size());
+    }
+
+    @Test
+    public void testQueryParameters() {
+        final Option q1 = new QueryOption("q1","option1 ");
+        final Option q2 = new QueryOption("q2","option2");
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(q1, q2), null){};
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
+        request.addQueryOption(new QueryOption("q3","option3"));
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
+        assertEquals(4,request.getOptions().size());
+    }
+
+    @Test
+    public void testFunctionAndQueryParameters() {
+        final Option f1 = new FunctionOption("f1", "fun1");
+        final Option f2 = new FunctionOption("f2", null);
+        final Option q1 = new QueryOption("q1","option1 ");
+        final Option q2 = new QueryOption("q2","option2");
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(f1, f2, q1, q2), null){};
+        assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
+        assertEquals(5, request.getOptions().size());
+    }
+
+    @Test
+    public void testHttpMethod() {
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, null, null){};
+        assertNull(request.getHttpMethod());
+        request.setHttpMethod(HttpMethod.GET);
+        assertEquals(HttpMethod.GET, request.getHttpMethod());
+    }
+
+    @Test
+    public void testHeader() {
+        final String expectedHeader = "header key";
+        final String expectedValue = "header value";
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, null, null){};
+        assertEquals(1, request.getHeaders().size());
+        assertEquals("SdkVersion", request.getHeaders().get(0).getName());
+        //assertEquals(String.format("graph-android-v%s", BuildConfig.VERSION_NAME), request.getHeaders().get(0).getValue());
+        request.addHeader(expectedHeader,expectedValue);
+        assertEquals(2,request.getHeaders().size());
+    }
+
+    @Test
+    public void testProtectedProperties() {
+        assertEquals(0, mRequest.functionOptions.size());
+        assertEquals(0, mRequest.queryOptions.size());
+        final Option q1 = new QueryOption("q1","option1 ");
+        final Option f1 = new FunctionOption("f1","option2");
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(q1,f1), null){};
+        assertEquals(1, request.functionOptions.size());
+        assertEquals(1, request.queryOptions.size());
+        assertEquals("q1", request.queryOptions.get(0).getName());
+        assertEquals("option1 ", request.queryOptions.get(0).getValue());
+        assertEquals("f1", request.functionOptions.get(0).getName());
+        assertEquals("option2", request.functionOptions.get(0).getValue());
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
new file mode 100644
index 000000000..b4d4991ce
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -0,0 +1,166 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.annotation.meta.When;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.stubbing.Answer;
+
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.Dispatcher;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+import static org.mockito.Mockito.*;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.BaseClient;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * Test cases for {@see BaseStreamRequest}
+ */
+public class BaseStreamRequestTests {
+
+    private BaseClient mBaseClient;
+
+    @Before
+    public void setUp() throws Exception {
+        mBaseClient = mock(BaseClient.class);
+    }
+
+    @Test
+    public void testSend() throws IOException {
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(200).message("OK").body(
+                   ResponseBody.create(
+                        "{ \"id\": \"zzz\" }",
+                        MediaType.parse("application/octet-stream")
+                ))
+                .build();
+
+        final OkHttpClient mockClient = getMockClient(response);
+        CoreHttpProvider mProvider = new CoreHttpProvider(mock(ISerializer.class),
+                mock(ILogger.class),
+                mockClient);
+        when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
+        final BaseStreamRequest<String> request = new BaseStreamRequest<String>("https://a.b.c/", mBaseClient,null, null){};
+        request.send();
+    }
+
+    @Test
+    public void testSendWithCallback() throws IOException, InterruptedException, ExecutionException {
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(200).message("OK").body(
+                   ResponseBody.create(
+                        "{ \"id\": \"zzz\" }",
+                        MediaType.parse("application/json")
+                ))
+                .build();
+
+        final OkHttpClient mockClient = getMockClient(response);
+        CoreHttpProvider mProvider = new CoreHttpProvider(mock(ISerializer.class),
+                mock(ILogger.class),
+                mockClient);
+        when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        final java.util.concurrent.CompletableFuture<InputStream> result = request.futureSend();
+        assertNotNull(result.get());
+        assertTrue(result.isDone());
+        assertFalse(result.isCancelled());
+    }
+
+    @Test
+    public void testSendWithContentAndCallback() throws IOException, InterruptedException, ExecutionException {
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(200).message("OK").body(
+                   ResponseBody.create(
+                        "{ \"id\": \"zzz\" }",
+                        MediaType.parse("application/json")
+                ))
+                .build();
+
+        final OkHttpClient mockClient = getMockClient(response);
+        CoreHttpProvider mProvider = new CoreHttpProvider(mock(ISerializer.class),
+                mock(ILogger.class),
+                mockClient);
+        when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        final java.util.concurrent.CompletableFuture<InputStream> result = request.futureSend(new byte[]{1, 2, 3, 4});
+        assertNotNull(result.get());
+        assertTrue(result.isDone());
+        assertFalse(result.isCancelled());
+    }
+
+    @Test
+    public void testSendWithContent() throws IOException {
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(200).message("OK").body(
+                   ResponseBody.create(
+                        "{ \"id\": \"zzz\" }",
+                        MediaType.parse("application/json")
+                ))
+                .build();
+
+        final OkHttpClient mockClient = getMockClient(response);
+
+        CoreHttpProvider mProvider = new CoreHttpProvider(mock(ISerializer.class),
+                mock(ILogger.class),
+                mockClient);
+        when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        request.send(new byte[]{1, 2, 3, 4});
+    }
+
+    @Test
+    public void testBaseMethod() {
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        assertEquals("https://a.b.c/", request.getRequestUrl().toString());
+        request.addHeader("header key", "header value");
+        assertEquals(2,request.getHeaders().size());
+        assertNull(request.getHttpMethod());
+        assertEquals(2, request.getOptions().size());
+    }
+    public static OkHttpClient getMockClient(final Response response) throws IOException {
+        final OkHttpClient mockClient = mock(OkHttpClient.class);
+        final Call remoteCall = mock(Call.class);
+        final Dispatcher dispatcher = new Dispatcher();
+        when(remoteCall.execute()).thenReturn(response);
+        doAnswer((Answer<Void>) invocation -> {
+            Callback callback = invocation.getArgument(0);
+            callback.onResponse(null, response);
+            return null;
+        }).when(remoteCall)
+            .enqueue(any(Callback.class));
+        when(mockClient.dispatcher()).thenReturn(dispatcher);
+        when(mockClient.newCall(any())).thenReturn(remoteCall);
+        return mockClient;
+    }
+}

From 7788912cfb1bc62538fe485bace675c82de52348 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 12:55:18 -0500
Subject: [PATCH 079/213] - moves another set of http tests to the core library

---
 .../graph/http/GraphErrorResponseTests.java   | 19 ++++
 .../microsoft/graph/http/GraphErrorTests.java | 31 +++++++
 .../http/GraphFatalServiceExceptionTests.java | 26 ++++++
 .../http/GraphServiceExceptionTests.java      | 90 +++++++++++++++++++
 .../graph/http/ReferenceRequestBodyTests.java | 24 +++++
 5 files changed, 190 insertions(+)
 create mode 100644 src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/GraphErrorTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java

diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
new file mode 100644
index 000000000..e00ebd5f1
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
@@ -0,0 +1,19 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.google.gson.JsonObject;
+
+public class GraphErrorResponseTests {
+
+	@Test
+	public void testSetRawObject() {
+        JsonObject expectedJson = new JsonObject();
+        GraphErrorResponse errorResponse = new GraphErrorResponse();
+        errorResponse.setRawObject(null,expectedJson);
+        assertEquals(expectedJson, errorResponse.rawObject);
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
new file mode 100644
index 000000000..0d8087e59
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
@@ -0,0 +1,31 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.microsoft.graph.core.GraphErrorCodes;
+
+public class GraphErrorTests {
+
+
+	@Test
+	public void testIsError(){
+        String expectedMessage = "test error message";
+        GraphError error = new GraphError();
+        error.code = GraphErrorCodes.ACCESS_DENIED.toString();
+        error.message = expectedMessage;
+        assertTrue(error.isError(GraphErrorCodes.ACCESS_DENIED));
+        assertEquals(expectedMessage, error.message);
+    }
+
+	@Test
+    public void testIsNotError() {
+        GraphError error = new GraphError();
+        error.code = GraphErrorCodes.ACCESS_DENIED.toString();
+        assertFalse(error.isError(GraphErrorCodes.UNAUTHENTICATED));
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
new file mode 100644
index 000000000..898de9e84
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
@@ -0,0 +1,26 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+
+import org.junit.Test;
+
+public class GraphFatalServiceExceptionTests {
+
+	@Test
+	public void testGraphFatalServiceException() {
+        GraphFatalServiceException exception = new GraphFatalServiceException(null,null,new ArrayList<String>(),null,401,"Unauthenticated",new ArrayList<String>(),null, false);
+        String expectedMessage = "Unexpected exception returned from the service." +
+                "null null\n" +
+                "\n" +
+                "\n" +
+                "401 : Unauthenticated\n" +
+                "[...]\n" +
+                "\n" +
+                "[Some information was truncated for brevity, enable debug logging for more details]";
+        String message = exception.getMessage();
+        assertEquals(expectedMessage, message);
+    }
+
+}
diff --git a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
new file mode 100644
index 000000000..cf0ee86a3
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
@@ -0,0 +1,90 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+import com.microsoft.graph.core.GraphErrorCodes;
+import com.microsoft.graph.logger.DefaultLogger;
+
+public class GraphServiceExceptionTests {
+
+	@Test
+	public void testError() {
+        GraphErrorResponse errorResponse = new GraphErrorResponse();
+        GraphError error = new GraphError();
+        error.code = GraphErrorCodes.UNAUTHENTICATED.toString();
+        errorResponse.error = error;
+        GraphServiceException exception = new GraphServiceException(null,null,new ArrayList<String>(),null,401,"Unauthorized",new ArrayList<String>(),errorResponse, false);
+        String message = exception.getMessage();
+        assertTrue(message.indexOf("Error code: UNAUTHENTICATED") == 0);
+        assertTrue(message.indexOf("401 : Unauthorized") > 0);
+        assertTrue(message.indexOf("truncated") > 0);
+        assertEquals(error,exception.getServiceError());
+    }
+
+	@Test
+	public void testVerboseError() {
+		GraphErrorResponse errorResponse = new GraphErrorResponse();
+        GraphError error = new GraphError();
+        error.code = GraphErrorCodes.UNAUTHENTICATED.toString();
+        errorResponse.error = error;
+        GraphServiceException exception = new GraphServiceException(null,null,new ArrayList<String>(),null,401,"Unauthorized",new ArrayList<String>(),errorResponse, true);
+        String message = exception.getMessage();
+        assertTrue(message.indexOf("Error code: UNAUTHENTICATED") == 0);
+        assertTrue(message.indexOf("401 : Unauthorized") > 0);
+        assertFalse(message.indexOf("truncated") > 0);
+        assertEquals(error,exception.getServiceError());
+	}
+
+	@Test
+    public void testcreateFromResponse() {
+		DefaultLogger logger = new DefaultLogger();
+        GraphServiceException exception = null;
+        Boolean success = false;
+        Boolean failure = false;
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(401).message("Unauthorized").body(
+                   ResponseBody.create(
+                        "{}",
+                        MediaType.parse("application/json")
+                ))
+                .build();
+        try{
+            IHttpRequest mRequest = mock(IHttpRequest.class);
+            when(mRequest.getRequestUrl()).thenReturn(new URL("http://localhost"));
+            exception = GraphServiceException.createFromResponse(mRequest ,null,null,response,logger);
+            success = true;
+        }catch (IOException ex){
+            failure = true;
+        }
+
+        assertTrue(success);
+        assertFalse(failure);
+
+        String message = exception.getMessage();
+        assertTrue(message.indexOf("Error code: Unable to parse error response message") == 0);
+        assertTrue(message.indexOf("http://localhost") > 0);
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
new file mode 100644
index 000000000..0b961685a
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
@@ -0,0 +1,24 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+
+import com.google.gson.JsonObject;
+import com.microsoft.graph.serializer.ISerializer;
+
+public class ReferenceRequestBodyTests {
+
+	@Test
+	public void testRawObject() {
+        ReferenceRequestBody body = new ReferenceRequestBody(null);
+        ISerializer serializer = mock(ISerializer.class);
+        JsonObject jsonObject = new JsonObject();
+        body.setRawObject(serializer,jsonObject);
+        assertEquals(serializer,body.getSerializer());
+        assertEquals(jsonObject,body.getRawObject());
+    }
+
+}

From b637452672e18c5c4bccf5e0866ac3ac05c4d093 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 13:46:32 -0500
Subject: [PATCH 080/213] - moves the remaining of the http tests to core

---
 .../http/BaseCollectionRequestTests.java      | 178 ++++++++++++++++++
 .../graph/http/CoreHttpProviderTests.java     | 144 ++++++++++++++
 2 files changed, 322 insertions(+)
 create mode 100644 src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
 create mode 100644 src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java

diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
new file mode 100644
index 000000000..37807b0dc
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -0,0 +1,178 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.anyObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.meta.When;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.serializer.ISerializer;
+
+/**
+ * Test cases for {@see BaseCollectionRequest}
+ */
+public class BaseCollectionRequestTests {
+
+    private IBaseClient mBaseClient;
+    @SuppressWarnings("unchecked")
+    private Class<ICollectionResponse<JsonObject>> jsonObjectCollectionResponseMockClass = (Class<ICollectionResponse<JsonObject>>)mock(ICollectionResponse.class).getClass();
+    @SuppressWarnings("unchecked")
+    private Class<BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>> jsonObjectCollectionPageMockClass = (Class<BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>>)mock(BaseCollectionPage.class).getClass();
+    @SuppressWarnings("unchecked")
+    private Class<BaseCollectionRequestBuilder<JsonObject,
+                                        BaseRequestBuilder<JsonObject>,
+                                        ICollectionResponse<JsonObject>,
+                                        BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>,
+                                        BaseCollectionRequest<JsonObject, ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>>>> jsonObjectCollectionRequestBuilderMockClass =
+                                        (Class<BaseCollectionRequestBuilder<JsonObject,
+                                        BaseRequestBuilder<JsonObject>,
+                                        ICollectionResponse<JsonObject>,
+                                        BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>,
+                                        BaseCollectionRequest<JsonObject, ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>>>>)
+                                        mock(BaseCollectionRequestBuilder.class).getClass();
+    private BaseEntityCollectionRequest<JsonObject, ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>> mRequest;
+
+    @Before
+    public void setUp() throws Exception {
+        mBaseClient = mock(IBaseClient.class);
+        final Response response = new Response.Builder()
+                .request(new Request.Builder().url("https://a.b.c").build())
+                .protocol(Protocol.HTTP_1_1)
+                .code(200).message("OK").body(
+                    ResponseBody.create(
+                        "[{ \"id\": \"zzz\" }]",
+                        MediaType.parse("application/json")
+                ))
+                .addHeader("Content-Type", "application/json")
+                .build();
+        final OkHttpClient mockClient = BaseStreamRequestTests.getMockClient(response);
+        final JsonObject resultobj = new JsonObject();
+        resultobj.add("id", new JsonPrimitive("zzz"));
+        @SuppressWarnings("unchecked")
+        final ICollectionResponse<JsonObject> result = mock(ICollectionResponse.class);
+        when(result.values()).thenReturn(new ArrayList<JsonObject>(Arrays.asList(resultobj)));
+        final ISerializer mSerializer = mock(ISerializer.class);
+        when(mSerializer.deserializeObject(anyObject(), anyObject(), anyObject())).thenReturn(result);
+        when(mSerializer.serializeObject(anyObject())).thenReturn("[{ \"id\": \"zzz\" }]");
+        CoreHttpProvider mProvider = new CoreHttpProvider(mSerializer,
+                mock(ILogger.class),
+                mockClient);
+        when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
+        mRequest = new BaseEntityCollectionRequest<JsonObject,ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>>("https://a.b.c/", mBaseClient, null, jsonObjectCollectionResponseMockClass, jsonObjectCollectionPageMockClass, jsonObjectCollectionRequestBuilderMockClass){};
+    }
+
+    @Test
+    public void testSend() {
+        final ICollectionResponse<JsonObject> result = mRequest.send();
+        assertNotNull(result);
+        assertEquals("zzz", result.values().get(0).get("id").getAsString());
+    }
+
+    @Test
+    public void testPost() {
+        final ICollectionResponse<JsonObject> result = mRequest.post(null);
+        assertNotNull(result);
+        assertEquals("zzz", result.values().get(0).get("id").getAsString());
+    }
+
+    @SuppressWarnings("unchecked")
+    private Class<ICollectionResponse<String>> stringCollectionResponseMockClass = (Class<ICollectionResponse<String>>)mock(ICollectionResponse.class).getClass();
+    @SuppressWarnings("unchecked")
+    private Class<BaseCollectionPage<String, BaseRequestBuilder<String>>> stringCollectionPageMockClass = (Class<BaseCollectionPage<String, BaseRequestBuilder<String>>>)mock(BaseCollectionPage.class).getClass();
+    @SuppressWarnings("unchecked")
+    private Class<BaseCollectionRequestBuilder<String,
+                                        BaseRequestBuilder<String>,
+                                        ICollectionResponse<String>,
+                                        BaseCollectionPage<String, BaseRequestBuilder<String>>,
+                                        BaseCollectionRequest<String, ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>>> stringCollectionRequestBuilderMockClass =
+                                        (Class<BaseCollectionRequestBuilder<String,
+                                        BaseRequestBuilder<String>,
+                                        ICollectionResponse<String>,
+                                        BaseCollectionPage<String, BaseRequestBuilder<String>>,
+                                        BaseCollectionRequest<String, ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>>>)
+                                        mock(BaseCollectionRequestBuilder.class).getClass();
+    @Test
+    public void testFunctionParameters() {
+        final Option f1 = new FunctionOption("1", "one");
+        final Option f2 = new FunctionOption("2", null);
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
+        request.addFunctionOption(new FunctionOption("3","two"));;
+        assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
+        assertEquals(4, request.getOptions().size());
+    }
+
+    @Test
+    public void testQueryParameters() {
+        final Option q1 = new QueryOption("q1","option1 ");
+        final Option q2 = new QueryOption("q2","option2");
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
+        request.addQueryOption(new QueryOption("q3","option3"));
+        assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
+        assertEquals(4,request.getOptions().size());
+    }
+
+    @Test
+    public void testFunctionAndQueryParameters() {
+        final Option f1 = new FunctionOption("f1", "fun1");
+        final Option f2 = new FunctionOption("f2", null);
+        final Option q1 = new QueryOption("q1","option1 ");
+        final Option q2 = new QueryOption("q2","option2");
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
+        assertEquals(5, request.getOptions().size());
+    }
+
+    @Test
+    public void testGetMethod() {
+        assertNull(mRequest.getHttpMethod());
+        mRequest.send();
+        assertEquals(HttpMethod.GET, mRequest.getHttpMethod());
+    }
+    @Test
+    public void testPostMethod() {
+        assertNull(mRequest.getHttpMethod());
+        mRequest.post(null);
+        assertEquals(HttpMethod.POST, mRequest.getHttpMethod());
+    }
+
+    @Test
+    public void testHeader() {
+        final String expectedHeader = "header key";
+        final String expectedValue = "header value";
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), null, stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        assertEquals(1, request.getHeaders().size());
+        request.addHeader(expectedHeader,expectedValue);
+        assertEquals(2,request.getHeaders().size());
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
new file mode 100644
index 000000000..710e8b924
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
@@ -0,0 +1,144 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.anyObject;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import okhttp3.OkHttpClient;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.core.GraphErrorCodes;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.ISerializer;
+
+@Ignore
+public class CoreHttpProviderTests {
+
+    private CoreHttpProvider mProvider;
+    private Gson GSON = new GsonBuilder().create();
+
+    @Test
+    public void testErrorResponse() throws Exception {
+        final GraphErrorCodes expectedErrorCode = GraphErrorCodes.INVALID_REQUEST;
+        final String expectedMessage = "Test error!";
+        final GraphErrorResponse toSerialize = new GraphErrorResponse();
+        toSerialize.error = new GraphError();
+        toSerialize.error.code = expectedErrorCode.toString();
+        toSerialize.error.message = expectedMessage;
+        toSerialize.error.innererror = null;
+
+        setCoreHttpProvider(toSerialize);
+        try {
+            mProvider.send(mock(IHttpRequest.class), Object.class, null);
+            fail("Expected exception in previous statement");
+        } catch (final GraphServiceException e) {
+        	assertTrue(e.getMessage().indexOf("truncated") > 0);
+            assertEquals(expectedMessage, e.getServiceError().message);
+        }
+    }
+
+    @Test
+    public void testVerboseErrorResponse() throws Exception {
+    	final GraphErrorCodes expectedErrorCode = GraphErrorCodes.INVALID_REQUEST;
+        final String expectedMessage = "Test error!";
+        final GraphErrorResponse toSerialize = new GraphErrorResponse();
+        toSerialize.error = new GraphError();
+        toSerialize.error.code = expectedErrorCode.toString();
+        toSerialize.error.message = expectedMessage;
+        toSerialize.error.innererror = null;
+        final JsonObject raw = new JsonObject();
+        raw.add("response", new JsonPrimitive("The raw request was invalid"));
+        toSerialize.rawObject = raw;
+
+        final ILogger logger = mock(ILogger.class);
+        logger.setLoggingLevel(LoggerLevel.DEBUG);
+        final ISerializer serializer = mock(ISerializer.class);
+        when(serializer.deserializeObject(anyObject(), anyObject())).thenReturn(toSerialize);
+
+        mProvider = new CoreHttpProvider(serializer,
+                logger,
+                new OkHttpClient.Builder().build());
+
+        try {
+            mProvider.send(mock(IHttpRequest.class), Object.class, null);
+            fail("Expected exception in previous statement");
+        } catch (final GraphServiceException e) {
+        	assertFalse(e.getMessage().indexOf("truncated") > 0);
+        	assertTrue(e.getMessage().indexOf("The raw request was invalid") > 0);
+        }
+    }
+
+    @Test
+    public void testHasHeaderReturnsTrue() {
+        HeaderOption h = new HeaderOption("name", "value");
+        assertTrue(CoreHttpProvider.hasHeader(Arrays.asList(h), "name"));
+    }
+
+    @Test
+    public void testHasHeaderReturnsTrueWhenDifferentCase() {
+        HeaderOption h = new HeaderOption("name", "value");
+        assertTrue(CoreHttpProvider.hasHeader(Arrays.asList(h), "NAME"));
+    }
+
+    @Test
+    public void testHasHeaderReturnsFalse() {
+        HeaderOption h = new HeaderOption("name", "value");
+        assertFalse(CoreHttpProvider.hasHeader(Arrays.asList(h), "blah"));
+    }
+
+    @Test
+    public void testStreamToStringReturnsData() {
+        String data = GSON.toJson(Maps.newHashMap(
+                ImmutableMap.<String, String>builder()
+                        .put("key", "value")
+                        .build()));
+        final InputStream inputStream = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
+
+        String convertedData = CoreHttpProvider.streamToString(inputStream);
+        assertEquals(data, convertedData);
+    }
+
+    @Test
+    public void testStreamToStringReturnsEmpty() {
+        final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+
+        String convertedData = CoreHttpProvider.streamToString(inputStream);
+        assertEquals("", convertedData);
+    }
+
+
+    /**
+     * Configures the http provider for test cases
+     * @param toSerialize The object to serialize
+     */
+    private void setCoreHttpProvider(final Object toSerialize) {
+        final ISerializer serializer = mock(ISerializer.class);
+        when(serializer.deserializeObject(anyObject(), anyObject())).thenReturn(toSerialize);
+        mProvider = new CoreHttpProvider(serializer,
+                mock(ILogger.class),
+                new OkHttpClient.Builder().build());
+    }
+
+}

From 59d5283b0ea3ce96fbacc19282ff315a11649e82 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 14:32:13 -0500
Subject: [PATCH 081/213] - merges BaseGraphServiceClient and BaseClient

---
 .../concurrency/ChunkedUploadProvider.java    |   6 +-
 .../concurrency/ChunkedUploadRequest.java     |   4 +-
 .../com/microsoft/graph/core/BaseClient.java  | 223 +++++++++++++++-
 .../graph/core/BaseGraphServiceClient.java    | 243 ------------------
 .../com/microsoft/graph/core/IBaseClient.java |  21 ++
 .../graph/core/IBaseGraphServiceClient.java   |  37 ---
 .../graph/core/GraphServiceClientTest.java    |  14 +-
 .../graph/http/BaseRequestTests.java          |   8 +-
 8 files changed, 259 insertions(+), 297 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java
 delete mode 100644 src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
index e0615814c..52caba689 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
@@ -27,7 +27,7 @@
 import com.microsoft.graph.concurrency.ChunkedUploadResult;
 import com.microsoft.graph.concurrency.IUploadSession;
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.options.Option;
 
 import java.io.IOException;
@@ -66,7 +66,7 @@ public class ChunkedUploadProvider<UploadType> {
     /**
      * The client
      */
-    private final IBaseGraphServiceClient client;
+    private final IBaseClient client;
 
     /**
      * The input stream
@@ -103,7 +103,7 @@ public class ChunkedUploadProvider<UploadType> {
      * @param uploadTypeClass the upload type class
      */
     public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
-                                 @Nonnull final IBaseGraphServiceClient client,
+                                 @Nonnull final IBaseClient client,
                                  @Nonnull final InputStream inputStream,
                                  final long streamSize,
                                  @Nonnull final Class<UploadType> uploadTypeClass) {
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
index 4fa9de084..87c37ed26 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -14,7 +14,7 @@
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.http.BaseRequest;
 import com.microsoft.graph.http.HttpMethod;
-import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.options.Option;
 
 /**
@@ -56,7 +56,7 @@ public class ChunkedUploadRequest<UploadType> {
      */
     @SuppressWarnings("unchecked")
     public ChunkedUploadRequest(@Nonnull final String requestUrl,
-                                @Nonnull final IBaseGraphServiceClient client,
+                                @Nonnull final IBaseClient client,
                                 @Nullable final List<? extends Option> options,
                                 @Nonnull final byte[] chunk,
                                 final int chunkSize,
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 2e1c68bf9..3f22fb93d 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -22,17 +22,238 @@
 
 package com.microsoft.graph.core;
 
+import com.google.gson.JsonObject;
+import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.IHttpProvider;
+import com.microsoft.graph.httpcore.HttpClients;
+import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
+import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
+import okhttp3.OkHttpClient;
+
 /**
  * A client that communications with an OData service
  */
-public abstract class BaseClient implements IBaseClient {
+public class BaseClient implements IBaseClient {
+    /**
+	 * Restricted constructor
+	 */
+	protected BaseClient() {
+    }
+
+    /**
+     * The default endpoint for the Microsoft Graph Service
+     */
+    public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
+
+    /**
+     * The current endpoint
+     */
+    private String endpoint;
+
+    @Override
+    @Nonnull
+    public String getServiceRoot() {
+        if (endpoint == null) {
+            endpoint = DEFAULT_GRAPH_ENDPOINT;
+        }
+        return endpoint;
+    }
+
+    @Override
+    public void setServiceRoot(@Nonnull final String value) {
+        endpoint = value;
+    }
+
+	/**
+	 * Send a custom request to Graph
+	 *
+	 * @param url
+	 *			the full URL to make a request with
+	 * @param responseType
+	 *			the response class to deserialize the response into
+	 * @return the instance of this builder
+	 */
+	@Nonnull
+	public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType) {
+		return new CustomRequestBuilder<T>(getServiceRoot() + url, this, null, responseType);
+	}
+
+	/**
+	 * Send a custom request to Graph
+	 *
+	 * @param url
+	 *			the full URL to make a request with
+	 * @return the instance of this builder
+	 */
+	@Nonnull
+	public CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url) {
+		return new CustomRequestBuilder<JsonObject>(getServiceRoot() + url, this, null,
+				JsonObject.class);
+	}
+
+	/**
+	 * Gets the builder to start configuring the client
+	 *
+	 * @return builder to start configuring the client
+	 */
+	@Nonnull
+	public static Builder<OkHttpClient> builder() {
+		return new Builder<OkHttpClient>();
+	}
+
+	/**
+	 * Builder to help configure the Graph service client
+	 */
+	public static final class Builder<httpClientType> {
+		private ISerializer serializer;
+		private IHttpProvider httpProvider;
+		private ILogger logger;
+		private httpClientType httpClient;
+		private ICoreAuthenticationProvider auth;
+
+		private ICoreAuthenticationProvider getAuth() {
+			if(auth == null) {
+				throw new NullPointerException("auth"); // TODO initialize to default once moved to core
+			} else {
+				return auth;
+			}
+		}
+		private ILogger getLogger() {
+			if(logger == null) {
+				return new DefaultLogger();
+			} else {
+				return logger;
+			}
+		}
+		private ISerializer getSerializer() {
+			if(serializer == null) {
+				return new DefaultSerializer(getLogger());
+			} else {
+				return serializer;
+			}
+		}
+		@SuppressWarnings("unchecked")
+		private httpClientType getHttpClient() {
+			if(httpClient == null) {
+				return (httpClientType)HttpClients.createDefault(getAuth());
+			} else {
+				return httpClient;
+			}
+		}
+		private IHttpProvider getHttpProvider() {
+			if(httpProvider == null) {
+				return new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
+			} else {
+				return httpProvider;
+			}
+		}
+
+		/**
+		 * Sets the serializer.
+		 *
+		 * @param serializer
+		 *			the serializer
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
+			checkNotNull(serializer, "serializer");
+			this.serializer = serializer;
+			return this;
+		}
+
+		/**
+		 * Sets the httpProvider
+		 *
+		 * @param httpProvider
+		 *			the httpProvider
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
+			checkNotNull(httpProvider, "httpProvider");
+			this.httpProvider = httpProvider;
+			return this;
+		}
+
+		/**
+		 * Sets the logger
+		 *
+		 * @param logger
+		 *			the logger
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
+			checkNotNull(logger, "logger");
+			this.logger = logger;
+			return this;
+		}
+
+		/**
+		 * Sets the http client
+		 *
+		 * @param client the http client
+		 *
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
+			checkNotNull(client, "client");
+			this.httpClient = client;
+			return this;
+		}
+
+		/**
+		 * Sets the authentication provider
+		 *
+		 * @param auth the authentication provider
+		 * @return the instance of this builder
+		 */
+		@Nonnull
+		public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthenticationProvider auth) {
+			checkNotNull(auth, "auth");
+			this.auth = auth;
+			return this;
+		}
+
+		/**
+		 * Builds and returns the Graph service client.
+		 *
+		 * @return the Graph service client object
+		 * @throws ClientException
+		 *			 if there was an exception creating the client
+		 */
+		@Nonnull
+		public IBaseClient buildClient() throws ClientException {
+			BaseClient client = new BaseClient();
+			client.setHttpProvider(this.getHttpProvider());
+			client.setLogger(this.getLogger());
+			client.setSerializer(this.getSerializer());
+			client.validate();
+			return client;
+		}
+	}
+
+	/**
+	 * Checks whether the provided object is null or not and throws an exception if it is
+	 *
+	 * @param o object to check
+	 * @param name name to use in the exception message
+	 */
+	protected static void checkNotNull(@Nullable final Object o, @Nonnull final String name) {
+		if (o==null) {
+			throw new NullPointerException(name + " cannot be null");
+		}
+    }
+
     /**
      * The HTTP provider instance
      */
diff --git a/src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java b/src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java
deleted file mode 100644
index 32be3db34..000000000
--- a/src/main/java/com/microsoft/graph/core/BaseGraphServiceClient.java
+++ /dev/null
@@ -1,243 +0,0 @@
-// ------------------------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
-// ------------------------------------------------------------------------------
-
-package com.microsoft.graph.core;
-
-import com.microsoft.graph.core.ClientException;
-
-import com.microsoft.graph.httpcore.HttpClients;
-import com.microsoft.graph.httpcore.ICoreAuthenticationProvider;
-import com.microsoft.graph.logger.*;
-import com.google.gson.JsonObject;
-import com.microsoft.graph.core.IBaseGraphServiceClient;
-import com.microsoft.graph.http.CoreHttpProvider;
-import com.microsoft.graph.http.IHttpProvider;
-import com.microsoft.graph.serializer.DefaultSerializer;
-import com.microsoft.graph.serializer.ISerializer;
-import com.microsoft.graph.core.CustomRequestBuilder;
-
-import okhttp3.OkHttpClient;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-
-/**
- * The class for the Graph Service Client.
- */
-public class BaseGraphServiceClient extends BaseClient implements IBaseGraphServiceClient {
-
-	/**
-	 * Restricted constructor
-	 */
-	protected BaseGraphServiceClient() {
-    }
-
-    /**
-     * The default endpoint for the Microsoft Graph Service
-     */
-    public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
-
-    /**
-     * The current endpoint
-     */
-    private String endpoint;
-
-    @Override
-    @Nonnull
-    public String getServiceRoot() {
-        if (endpoint == null) {
-            endpoint = DEFAULT_GRAPH_ENDPOINT;
-        }
-        return endpoint;
-    }
-
-    @Override
-    public void setServiceRoot(@Nonnull final String value) {
-        endpoint = value;
-    }
-
-	/**
-	 * Send a custom request to Graph
-	 *
-	 * @param url
-	 *			the full URL to make a request with
-	 * @param responseType
-	 *			the response class to deserialize the response into
-	 * @return the instance of this builder
-	 */
-	@Nonnull
-	public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType) {
-		return new CustomRequestBuilder<T>(getServiceRoot() + url, this, null, responseType);
-	}
-
-	/**
-	 * Send a custom request to Graph
-	 *
-	 * @param url
-	 *			the full URL to make a request with
-	 * @return the instance of this builder
-	 */
-	@Nonnull
-	public CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url) {
-		return new CustomRequestBuilder<JsonObject>(getServiceRoot() + url, this, null,
-				JsonObject.class);
-	}
-
-	/**
-	 * Gets the builder to start configuring the client
-	 *
-	 * @return builder to start configuring the client
-	 */
-	@Nonnull
-	public static Builder<OkHttpClient> builder() {
-		return new Builder<OkHttpClient>();
-	}
-
-	/**
-	 * Builder to help configure the Graph service client
-	 */
-	public static final class Builder<httpClientType> {
-		private ISerializer serializer;
-		private IHttpProvider httpProvider;
-		private ILogger logger;
-		private httpClientType httpClient;
-		private ICoreAuthenticationProvider auth;
-
-		private ICoreAuthenticationProvider getAuth() {
-			if(auth == null) {
-				throw new NullPointerException("auth"); // TODO initialize to default once moved to core
-			} else {
-				return auth;
-			}
-		}
-		private ILogger getLogger() {
-			if(logger == null) {
-				return new DefaultLogger();
-			} else {
-				return logger;
-			}
-		}
-		private ISerializer getSerializer() {
-			if(serializer == null) {
-				return new DefaultSerializer(getLogger());
-			} else {
-				return serializer;
-			}
-		}
-		@SuppressWarnings("unchecked")
-		private httpClientType getHttpClient() {
-			if(httpClient == null) {
-				return (httpClientType)HttpClients.createDefault(getAuth());
-			} else {
-				return httpClient;
-			}
-		}
-		private IHttpProvider getHttpProvider() {
-			if(httpProvider == null) {
-				return new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
-			} else {
-				return httpProvider;
-			}
-		}
-
-		/**
-		 * Sets the serializer.
-		 *
-		 * @param serializer
-		 *			the serializer
-		 * @return the instance of this builder
-		 */
-		@Nonnull
-		public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
-			checkNotNull(serializer, "serializer");
-			this.serializer = serializer;
-			return this;
-		}
-
-		/**
-		 * Sets the httpProvider
-		 *
-		 * @param httpProvider
-		 *			the httpProvider
-		 * @return the instance of this builder
-		 */
-		@Nonnull
-		public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
-			checkNotNull(httpProvider, "httpProvider");
-			this.httpProvider = httpProvider;
-			return this;
-		}
-
-		/**
-		 * Sets the logger
-		 *
-		 * @param logger
-		 *			the logger
-		 * @return the instance of this builder
-		 */
-		@Nonnull
-		public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
-			checkNotNull(logger, "logger");
-			this.logger = logger;
-			return this;
-		}
-
-		/**
-		 * Sets the http client
-		 *
-		 * @param client the http client
-		 *
-		 * @return the instance of this builder
-		 */
-		@Nonnull
-		public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
-			checkNotNull(client, "client");
-			this.httpClient = client;
-			return this;
-		}
-
-		/**
-		 * Sets the authentication provider
-		 *
-		 * @param auth the authentication provider
-		 * @return the instance of this builder
-		 */
-		@Nonnull
-		public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthenticationProvider auth) {
-			checkNotNull(auth, "auth");
-			this.auth = auth;
-			return this;
-		}
-
-		/**
-		 * Builds and returns the Graph service client.
-		 *
-		 * @return the Graph service client object
-		 * @throws ClientException
-		 *			 if there was an exception creating the client
-		 */
-		@Nonnull
-		public IBaseGraphServiceClient buildClient() throws ClientException {
-			BaseGraphServiceClient client = new BaseGraphServiceClient();
-			client.setHttpProvider(this.getHttpProvider());
-			client.setLogger(this.getLogger());
-			client.setSerializer(this.getSerializer());
-			client.validate();
-			return client;
-		}
-	}
-
-	/**
-	 * Checks whether the provided object is null or not and throws an exception if it is
-	 *
-	 * @param o object to check
-	 * @param name name to use in the exception message
-	 */
-	protected static void checkNotNull(@Nullable final Object o, @Nonnull final String name) {
-		if (o==null) {
-			throw new NullPointerException(name + " cannot be null");
-		}
-	}
-}
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index 25e74322c..db670f936 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -25,6 +25,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
+import com.google.gson.JsonObject;
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
@@ -76,4 +77,24 @@ public interface IBaseClient {
      * Validates this client
      */
     void validate();
+
+    /**
+     * Gets a builder to execute a custom request
+     *
+     * @return the custom request builder
+     * @param url the url to send the request to
+     * @param responseType the class to deserialize the response to
+     * @param <T> the type to deserialize the response to
+     */
+    @Nonnull
+    <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType);
+
+    /**
+     * Gets a builder to execute a custom request with a generic JSONObject response
+     *
+     * @return the custom request builder
+     * @param url the url to send the request to
+     */
+    @Nonnull
+    CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url);
 }
diff --git a/src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java b/src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java
deleted file mode 100644
index 232a530a5..000000000
--- a/src/main/java/com/microsoft/graph/core/IBaseGraphServiceClient.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// ------------------------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
-// ------------------------------------------------------------------------------
-
-package com.microsoft.graph.core;
-
-import com.google.gson.JsonObject;
-
-import javax.annotation.Nonnull;
-
-import com.microsoft.graph.core.CustomRequestBuilder;
-
-/**
- * The interface for the Graph Service Client.
- */
-public interface IBaseGraphServiceClient extends IBaseClient {
-
-    /**
-     * Gets a builder to execute a custom request
-     *
-     * @return the custom request builder
-     * @param url the url to send the request to
-     * @param responseType the class to deserialize the response to
-     * @param <T> the type to deserialize the response to
-     */
-    @Nonnull
-    <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType);
-
-    /**
-     * Gets a builder to execute a custom request with a generic JSONObject response
-     *
-     * @return the custom request builder
-     * @param url the url to send the request to
-     */
-    @Nonnull
-    CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url);
-}
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index 716f41fd0..4d8695a30 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -33,7 +33,7 @@ public Request authenticateRequest(Request request) {
     @Test
     public void testClientMethodsReturnStuff() {
         ILogger logger = createLogger();
-        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+        IBaseClient client = BaseClient.builder()
                 .logger(logger)
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
@@ -45,7 +45,7 @@ public void testClientMethodsReturnStuff() {
     @Test
     public void testOverrideOfDefaultLogger() {
         ILogger logger = createLogger();
-        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+        IBaseClient client = BaseClient.builder()
                 .logger(logger)
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
@@ -59,7 +59,7 @@ public void testOverrideOfDefaultLogger() {
 
     @Test
     public void testOverrideOfDefaultAuthenticationProvider() {
-        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+        IBaseClient client = BaseClient.builder()
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
         assertNotNull(client.getHttpProvider());
@@ -87,7 +87,7 @@ public <T> T deserializeObject(String inputString, Class<T> clazz) {
                 return null;
             }
         };
-        IBaseGraphServiceClient client = BaseGraphServiceClient.builder()
+        IBaseClient client = BaseClient.builder()
                 .serializer(serializer)
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
@@ -136,7 +136,7 @@ public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Res
 				return null;
             }
         };
-        IBaseGraphServiceClient client = BaseGraphServiceClient
+        IBaseClient client = BaseClient
                 .builder()
                 .httpProvider(hp)
                 .buildClient();
@@ -147,12 +147,12 @@ public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Res
 
     @Test(expected = NullPointerException.class)
     public void testHttpProviderCannotBeNull() {
-        BaseGraphServiceClient.builder().httpProvider(null);
+        BaseClient.builder().httpProvider(null);
     }
 
     @Test(expected = NullPointerException.class)
     public void testLoggerCannotBeNull() {
-        BaseGraphServiceClient.builder().logger(null);
+        BaseClient.builder().logger(null);
     }
 
     private static ILogger createLogger() {
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index b767d13f2..cff2d8801 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -28,17 +28,17 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.IBaseGraphServiceClient;
+import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
-import com.microsoft.graph.core.BaseGraphServiceClient;
+import com.microsoft.graph.core.BaseClient;
 
 /**
  * Test cases for {@see BaseRequest}
  */
 public class BaseRequestTests {
-    private IBaseGraphServiceClient mBaseClient;
+    private IBaseClient mBaseClient;
     private BaseRequest<JsonObject> mRequest;
     private JsonObject callbackJsonObject;
 
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
         final OkHttpClient mockClient = BaseStreamRequestTests.getMockClient(response);
         final JsonObject result = new JsonObject();
         result.add("id", new JsonPrimitive("zzz"));
-        mBaseClient = BaseGraphServiceClient.builder()
+        mBaseClient = BaseClient.builder()
                 .httpClient(mockClient)
                 .buildClient();
         mRequest = new BaseRequest<JsonObject>("https://a.b.c/", mBaseClient, null,JsonObject.class){};

From cb7f91544b23ab3eb0e22956776170e67d37a990 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 18 Jan 2021 14:47:13 -0500
Subject: [PATCH 082/213] - removes unused imports

---
 .../graph/concurrency/ChunkedUploadResponseHandler.java       | 3 ---
 .../com/microsoft/graph/concurrency/ChunkedUploadResult.java  | 1 -
 src/main/java/com/microsoft/graph/http/BaseRequest.java       | 4 ----
 3 files changed, 8 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index b0f8dce82..123be3033 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -23,7 +23,6 @@
 package com.microsoft.graph.concurrency;
 
 import java.io.BufferedInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
@@ -39,8 +38,6 @@
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.http.IStatefulResponseHandler;
 import com.microsoft.graph.logger.ILogger;
-import com.microsoft.graph.concurrency.IUploadSession;
-import com.microsoft.graph.concurrency.ChunkedUploadResult;
 import com.microsoft.graph.serializer.ISerializer;
 
 import okhttp3.Response;
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
index 4a4104641..40bd7d29a 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
@@ -6,7 +6,6 @@
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.http.GraphServiceException;
-import com.microsoft.graph.concurrency.IUploadSession;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index 7c619f994..8c24ad6d5 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -26,8 +26,6 @@
 import okhttp3.Request;
 import okhttp3.HttpUrl.Builder;
 
-import com.microsoft.graph.content.MSBatchRequestContent;
-import com.microsoft.graph.content.MSBatchRequestStep;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
@@ -43,11 +41,9 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;

From bb5c91e7527092933e9fc7694c4ab1ab5a5b7e25 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 09:33:11 -0500
Subject: [PATCH 083/213] - allows for client builder extensibility so the
 service library can extend it

---
 .../com/microsoft/graph/core/BaseClient.java  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 3f22fb93d..873b58fff 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -111,14 +111,14 @@ public static Builder<OkHttpClient> builder() {
 	/**
 	 * Builder to help configure the Graph service client
 	 */
-	public static final class Builder<httpClientType> {
+	public static class Builder<httpClientType> {
 		private ISerializer serializer;
 		private IHttpProvider httpProvider;
 		private ILogger logger;
 		private httpClientType httpClient;
 		private ICoreAuthenticationProvider auth;
 
-		private ICoreAuthenticationProvider getAuth() {
+		private ICoreAuthenticationProvider getAuthenticationProvider() {
 			if(auth == null) {
 				throw new NullPointerException("auth"); // TODO initialize to default once moved to core
 			} else {
@@ -142,7 +142,7 @@ private ISerializer getSerializer() {
 		@SuppressWarnings("unchecked")
 		private httpClientType getHttpClient() {
 			if(httpClient == null) {
-				return (httpClientType)HttpClients.createDefault(getAuth());
+				return (httpClientType)HttpClients.createDefault(getAuthenticationProvider());
 			} else {
 				return httpClient;
 			}
@@ -224,6 +224,24 @@ public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthen
 			return this;
 		}
 
+		/**
+		 * Builds and returns the Graph service client.
+		 *
+		 * @param instance the instance to set the information for
+		 * @param <ClientType> the type of the client to return
+		 * @return the Graph service client object
+		 * @throws ClientException
+		 *			 if there was an exception creating the client
+		 */
+		@Nonnull
+		protected <ClientType extends BaseClient> ClientType buildClient(ClientType instance) throws ClientException {
+			instance.setHttpProvider(this.getHttpProvider());
+			instance.setLogger(this.getLogger());
+			instance.setSerializer(this.getSerializer());
+			instance.validate();
+			return instance;
+		}
+
 		/**
 		 * Builds and returns the Graph service client.
 		 *
@@ -233,12 +251,7 @@ public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthen
 		 */
 		@Nonnull
 		public IBaseClient buildClient() throws ClientException {
-			BaseClient client = new BaseClient();
-			client.setHttpProvider(this.getHttpProvider());
-			client.setLogger(this.getLogger());
-			client.setSerializer(this.getSerializer());
-			client.validate();
-			return client;
+			return buildClient(new BaseClient());
 		}
 	}
 

From dec98ba8af3c99fbd6c2489958ccfbc306a191e7 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 09:33:33 -0500
Subject: [PATCH 084/213] - removes extensions and generated additional
 namespaces in reflection

---
 .../serializer/CollectionPageSerializer.java  | 13 +++---
 .../graph/serializer/DefaultSerializer.java   | 44 +++++++++----------
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index fe7459edc..dbd598cf5 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -52,8 +52,6 @@ public class CollectionPageSerializer {
 	private final static Integer collectionLength = 10;
 	/** length of the work "response" */
 	private final static Integer responseLength = 8;
-	/** the extensions segment in the package name of target classes */
-	private final static String extensionsPath = "extensions.";
 
 	/**
 	 * Not available for instantiation
@@ -109,9 +107,9 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
 		serializer = new DefaultSerializer(logger);
 		final JsonArray sourceArray = json.getAsJsonArray();
 		final ArrayList<T1> list = new ArrayList<T1>(sourceArray.size());
-		/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionPage */
+		/** eg: com.microsoft.graph.requests.AttachmentCollectionPage */
 		final String collectionPageClassCanonicalName = ((Class<?>)typeOfT).getName();
-		/** eg: com.microsoft.graph.models.extensions.Attachment */
+		/** eg: com.microsoft.graph.models.Attachment */
 		final String baseEntityClassCanonicalName = collectionPageClassCanonicalName
 					.substring(0, collectionPageClassCanonicalName.length() - pageLength - collectionLength)
 					.replace("requests", "models");
@@ -128,17 +126,16 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
 					list.add(targetObject);
 				}
 			}
-			/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionResponse */
+			/** eg: com.microsoft.graph.requests.AttachmentCollectionResponse */
 			final String responseClassCanonicalName = collectionPageClassCanonicalName
 						.substring(0, collectionPageClassCanonicalName.length() - pageLength) + "Response";
 			final Class<?> responseClass = Class.forName(responseClassCanonicalName);
 			final Object response = responseClass.getConstructor().newInstance();
 			responseClass.getField("value").set(response, list);
 			final Class<?> collectionPageClass = Class.forName(collectionPageClassCanonicalName);
-			/** eg: com.microsoft.graph.requests.extensions.AttachmentCollectionRequestBuilder */
+			/** eg: com.microsoft.graph.requests.AttachmentCollectionRequestBuilder */
 			final String responseBuilderCanonicalName = responseClassCanonicalName
-						.substring(0, responseClassCanonicalName.length() - responseLength)
-						.replace(extensionsPath, extensionsPath) + "RequestBuilder";
+						.substring(0, responseClassCanonicalName.length() - responseLength) + "RequestBuilder";
 			final Class<?> responseBuilderClass = Class.forName(responseBuilderCanonicalName);
 			return (BaseCollectionPage<T1, T2>)collectionPageClass.getConstructor(responseClass, responseBuilderClass).newInstance(response, null);
 		} catch(ClassNotFoundException ex) {
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index cf0420a52..eeef48fb1 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.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
@@ -101,7 +101,7 @@ public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final
 			}
 
 			final IJsonBackedObject jsonBackedObject = (IJsonBackedObject) jo;
-			
+
 			if(rawElement.isJsonObject()) {
 				jsonBackedObject.setRawObject(this, rawObject);
 				jsonBackedObject.additionalDataManager().setAdditionalData(rawObject);
@@ -146,7 +146,7 @@ private void setChildAdditionalData(final IJsonBackedObject serializedObject, fi
 								if (child instanceof IJsonBackedObject) {
 									final AdditionalDataManager childAdditionalDataManager = ((IJsonBackedObject) child).additionalDataManager();
 									final JsonElement fieldElement = rawJson.get(field.getName());
-									if(fieldElement != null && fieldElement.isJsonObject() 
+									if(fieldElement != null && fieldElement.isJsonObject()
 											&& fieldElement.getAsJsonObject().get(pair.getKey()) != null
 											&& fieldElement.getAsJsonObject().get(pair.getKey()).isJsonObject()) {
 										childAdditionalDataManager.setAdditionalData(fieldElement.getAsJsonObject().get(pair.getKey()).getAsJsonObject());
@@ -172,7 +172,7 @@ else if (fieldObject instanceof List) {
 										}
 									}
 								}
-								if (rawJsonArraySize != fieldObjectListSize) 
+								if (rawJsonArraySize != fieldObjectListSize)
 									logger.logDebug("rawJsonArray has a size of " + rawJsonArraySize + " and fieldObjectList of " + fieldObjectListSize);
 							}
 						}
@@ -195,7 +195,7 @@ else if (fieldObject instanceof IJsonBackedObject) {
 			}
 		}
 	}
-	
+
 	/**
 	 * Serializes an object into a string
 	 *
@@ -237,23 +237,23 @@ public <T> String serializeObject(@Nonnull final T serializableObject) {
 	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;
 		}
 	}
-	
+
 	/**
 	 * 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
 	 */
@@ -268,13 +268,13 @@ private void getChildAdditionalData(final IJsonBackedObject serializableObject,
 				final JsonElement fieldJsonElement = outJson.get(field.getName());
 				if(fieldObject == null || field == 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();
@@ -303,7 +303,7 @@ else if (fieldObject instanceof List && fieldJsonElement.isJsonArray()) {
 
 	/**
 	 * 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
 	 */
@@ -319,7 +319,7 @@ private void addAdditionalDataFromJsonElementToJson (final Object item, final Js
 
 	/**
 	 * Add each non-transient additional data property to the given JSON node
-	 * 
+	 *
 	 * @param additionalDataManager the additional data bag to iterate through
 	 * @param jsonNode			  the JSON node to add the additional data properties to
 	 */
@@ -330,13 +330,13 @@ private void addAdditionalDataFromManagerToJson(AdditionalDataManager additional
 			}
 		}
 	}
-	
+
 	private final static String ODATA_TYPE_KEY = "@odata.type";
 	/**
 	 * Get the derived class for the given JSON object
 	 * This covers scenarios in which the service may return one of several derived types
 	 * of a base object, which it defines using the odata.type parameter
-	 * 
+	 *
 	 * @param jsonObject  the raw JSON object of the response
 	 * @param parentClass the parent class the derived class should inherit from
 	 * @return			the derived class if found, or null if not applicable
@@ -348,9 +348,9 @@ public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nonnull f
 			/** #microsoft.graph.user or #microsoft.graph.callrecords.callrecord */
 			final String odataType = jsonObject.get(ODATA_TYPE_KEY).getAsString();
 			final Integer lastDotIndex = odataType.lastIndexOf(".");
-			final String derivedType = (odataType.substring(0, lastDotIndex) + 
-											".models.extensions." + 
-											CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, 
+			final String derivedType = (odataType.substring(0, lastDotIndex) +
+											".models." +
+											CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL,
 																		odataType.substring(lastDotIndex + 1)))
 										.replace("#", "com.");
 			try {
@@ -373,7 +373,7 @@ public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nonnull f
 
 	/**
 	 * Gets the logger in use
-	 * 
+	 *
 	 * @return a logger
 	 */
 	@VisibleForTesting

From a6f6ab494b2b14cbb4926d70c59690c72c205823 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 10:33:49 -0500
Subject: [PATCH 085/213] - replaces version constant by provider from the
 client

---
 .../com/microsoft/graph/core/BaseClient.java  | 10 ++++++++
 .../com/microsoft/graph/core/Constants.java   |  3 ---
 .../com/microsoft/graph/core/IBaseClient.java |  7 ++++++
 .../com/microsoft/graph/http/BaseRequest.java | 11 +++++----
 .../http/BaseCollectionRequestTests.java      | 10 ++++----
 .../graph/http/BaseRequestTests.java          | 24 +++++++++----------
 .../graph/http/BaseStreamRequestTests.java    |  4 ++--
 7 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 873b58fff..20f32925d 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -354,4 +354,14 @@ protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
     public void setSerializer(@Nonnull final ISerializer serializer) {
         this.serializer = serializer;
     }
+
+    /**
+     * Gets the service SDK version if the service SDK is in use, null otherwise
+     * @return the service SDK version if the service SDK is in use, null otherwise
+     */
+    @Override
+    @Nullable
+    public String getServiceSDKVersion() {
+        return null;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/core/Constants.java b/src/main/java/com/microsoft/graph/core/Constants.java
index 474f47fad..651cb996f 100644
--- a/src/main/java/com/microsoft/graph/core/Constants.java
+++ b/src/main/java/com/microsoft/graph/core/Constants.java
@@ -24,8 +24,5 @@ private Constants() {
 	 * The binary content type header's value
 	 */
 	public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
-
-	/** The SDK version */
-	public static final String VERSION_NAME = "2.5.0";
 }
 
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index db670f936..6b04f8438 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -97,4 +97,11 @@ public interface IBaseClient {
      */
     @Nonnull
     CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url);
+
+    /**
+     * Gets the service SDK version if the service SDK is in use, null otherwise
+     * @return the service SDK version if the service SDK is in use, null otherwise
+     */
+    @Nullable
+    String getServiceSDKVersion();
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index 8c24ad6d5..36b3a045c 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -38,6 +38,7 @@
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 
+import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -164,11 +165,13 @@ public BaseRequest(@Nonnull final String requestUrl,
                 }
             }
         }
-        final HeaderOption requestStatsHeader = new HeaderOption(REQUEST_STATS_HEADER_NAME,
-                String.format(REQUEST_STATS_HEADER_VALUE_FORMAT_STRING, Constants.VERSION_NAME));
-        headersOptions.add(requestStatsHeader);
+        final String sdkVersion = client == null ? null : client.getServiceSDKVersion();
+        if(sdkVersion != null) {
+            final HeaderOption requestStatsHeader = new HeaderOption(REQUEST_STATS_HEADER_NAME,
+                    String.format(REQUEST_STATS_HEADER_VALUE_FORMAT_STRING, sdkVersion));
+            headersOptions.add(requestStatsHeader);
+        }
     }
-
     /**
      * Gets the request URL
      *
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
index 37807b0dc..b7ca9b91f 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -128,7 +128,7 @@ public void testFunctionParameters() {
         assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
         assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
-        assertEquals(4, request.getOptions().size());
+        assertEquals(3, request.getOptions().size());
     }
 
     @Test
@@ -139,7 +139,7 @@ public void testQueryParameters() {
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
-        assertEquals(4,request.getOptions().size());
+        assertEquals(3,request.getOptions().size());
     }
 
     @Test
@@ -150,7 +150,7 @@ public void testFunctionAndQueryParameters() {
         final Option q2 = new QueryOption("q2","option2");
         final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
         assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
-        assertEquals(5, request.getOptions().size());
+        assertEquals(4, request.getOptions().size());
     }
 
     @Test
@@ -171,8 +171,8 @@ public void testHeader() {
         final String expectedHeader = "header key";
         final String expectedValue = "header value";
         final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), null, stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
-        assertEquals(1, request.getHeaders().size());
+        assertEquals(0, request.getHeaders().size());
         request.addHeader(expectedHeader,expectedValue);
-        assertEquals(2,request.getHeaders().size());
+        assertEquals(1,request.getHeaders().size());
     }
 }
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index cff2d8801..544cd6a75 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -82,22 +82,22 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
     public void testFunctionParameters() {
         final Option fo1 = new FunctionOption("1", "one");
         final Option fo2 = new FunctionOption("2", null);
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(fo1, fo2), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(fo1, fo2), null){};
         assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
         assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
-        assertEquals(4, request.getOptions().size());
+        assertEquals(3, request.getOptions().size());
     }
 
     @Test
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(q1, q2), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), null){};
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
-        assertEquals(4,request.getOptions().size());
+        assertEquals(3,request.getOptions().size());
     }
 
     @Test
@@ -106,14 +106,14 @@ public void testFunctionAndQueryParameters() {
         final Option f2 = new FunctionOption("f2", null);
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(f1, f2, q1, q2), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), null){};
         assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
-        assertEquals(5, request.getOptions().size());
+        assertEquals(4, request.getOptions().size());
     }
 
     @Test
     public void testHttpMethod() {
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, null, null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
         assertNull(request.getHttpMethod());
         request.setHttpMethod(HttpMethod.GET);
         assertEquals(HttpMethod.GET, request.getHttpMethod());
@@ -123,12 +123,10 @@ public void testHttpMethod() {
     public void testHeader() {
         final String expectedHeader = "header key";
         final String expectedValue = "header value";
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, null, null){};
-        assertEquals(1, request.getHeaders().size());
-        assertEquals("SdkVersion", request.getHeaders().get(0).getName());
-        //assertEquals(String.format("graph-android-v%s", BuildConfig.VERSION_NAME), request.getHeaders().get(0).getValue());
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
+        assertEquals(0, request.getHeaders().size());
         request.addHeader(expectedHeader,expectedValue);
-        assertEquals(2,request.getHeaders().size());
+        assertEquals(1,request.getHeaders().size());
     }
 
     @Test
@@ -137,7 +135,7 @@ public void testProtectedProperties() {
         assertEquals(0, mRequest.queryOptions.size());
         final Option q1 = new QueryOption("q1","option1 ");
         final Option f1 = new FunctionOption("f1","option2");
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", null, Arrays.asList(q1,f1), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1,f1), null){};
         assertEquals(1, request.functionOptions.size());
         assertEquals(1, request.queryOptions.size());
         assertEquals("q1", request.queryOptions.get(0).getName());
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
index b4d4991ce..13b06fdf9 100644
--- a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -144,9 +144,9 @@ public void testBaseMethod() {
         final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         assertEquals("https://a.b.c/", request.getRequestUrl().toString());
         request.addHeader("header key", "header value");
-        assertEquals(2,request.getHeaders().size());
+        assertEquals(1,request.getHeaders().size());
         assertNull(request.getHttpMethod());
-        assertEquals(2, request.getOptions().size());
+        assertEquals(1, request.getOptions().size());
     }
     public static OkHttpClient getMockClient(final Response response) throws IOException {
         final OkHttpClient mockClient = mock(OkHttpClient.class);

From e8d22117d7b810c083b1370476fb53f35ef46db3 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 10:50:26 -0500
Subject: [PATCH 086/213] - removes unecessary validate method for base client
 - improves testing coverage for base client

---
 .../com/microsoft/graph/core/BaseClient.java  | 18 ++-------
 .../com/microsoft/graph/core/IBaseClient.java |  5 ---
 .../microsoft/graph/core/BaseClientTests.java | 40 +++++--------------
 3 files changed, 12 insertions(+), 51 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 20f32925d..b1b8b4c44 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -238,7 +238,6 @@ protected <ClientType extends BaseClient> ClientType buildClient(ClientType inst
 			instance.setHttpProvider(this.getHttpProvider());
 			instance.setLogger(this.getLogger());
 			instance.setSerializer(this.getSerializer());
-			instance.validate();
 			return instance;
 		}
 
@@ -314,26 +313,13 @@ public ISerializer getSerializer() {
         return serializer;
     }
 
-    /**
-     * Validates this client
-     */
-    @Override
-    public void validate() {
-        if (httpProvider == null) {
-            throw new NullPointerException("HttpProvider");
-        }
-
-        if (serializer == null) {
-            throw new NullPointerException("Serializer");
-        }
-    }
-
     /**
      * Sets the logger
      *
      * @param logger The logger
      */
     protected void setLogger(@Nonnull final ILogger logger) {
+        checkNotNull(logger, "logger");
         this.logger = logger;
     }
 
@@ -343,6 +329,7 @@ protected void setLogger(@Nonnull final ILogger logger) {
      * @param httpProvider The HTTP provider
      */
     protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
+        checkNotNull(httpProvider, "httpProvider");
         this.httpProvider = httpProvider;
     }
 
@@ -352,6 +339,7 @@ protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
      * @param serializer The serializer
      */
     public void setSerializer(@Nonnull final ISerializer serializer) {
+        checkNotNull(serializer, "serializer");
         this.serializer = serializer;
     }
 
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index 6b04f8438..5fc483f42 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -73,11 +73,6 @@ public interface IBaseClient {
     @Nullable
     ISerializer getSerializer();
 
-    /**
-     * Validates this client
-     */
-    void validate();
-
     /**
      * Gets a builder to execute a custom request
      *
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index a47bfa08f..f8f6b309a 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -13,6 +13,7 @@
 import okhttp3.OkHttpClient;
 
 import com.microsoft.graph.http.IHttpProvider;
+import com.google.gson.JsonObject;
 import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
@@ -22,7 +23,6 @@
  */
 public class BaseClientTests {
 	public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
-    private String mEndpoint = DEFAULT_GRAPH_ENDPOINT;
     private BaseClient baseClient;
     private IHttpProvider mHttpProvider;
     private ILogger mLogger;
@@ -30,17 +30,7 @@ public class BaseClientTests {
 
 	@Before
 	public void setUp() throws Exception {
-        baseClient = new BaseClient() {
-            @Override
-            public String getServiceRoot() {
-                return mEndpoint;
-            }
-
-            @Override
-            public void setServiceRoot(String value) {
-                mEndpoint = value;
-            }
-        };
+        baseClient = new BaseClient();
         mLogger = mock(ILogger.class);
         mSerializer = mock(ISerializer.class);
         mHttpProvider = new CoreHttpProvider(mSerializer,
@@ -56,24 +46,6 @@ public void testNotNull() {
         assertNotNull(mSerializer);
     }
 
-	@Test
-    public void testValidateThrowException() {
-        Boolean success = false;
-        try {
-            baseClient.validate();
-        }catch (NullPointerException nEx){
-            success = true;
-        }
-        assertTrue(success);
-    }
-
-	@Test
-    public void testValidateSuccess() throws Exception {
-        baseClient.setHttpProvider(mHttpProvider);
-        baseClient.setSerializer(mSerializer);
-        baseClient.validate();
-    }
-
 	@Test
     public void testEndPoint() {
         assertEquals(DEFAULT_GRAPH_ENDPOINT, baseClient.getServiceRoot());
@@ -101,5 +73,11 @@ public void testSerializer() {
         baseClient.setSerializer(mSerializer);
         assertEquals(mSerializer, baseClient.getSerializer());
     }
-
+    @Test
+    public void testCustomRequest() {
+        final CustomRequestBuilder<JsonObject> simpleRequest = baseClient.customRequest("");
+        assertNotNull(simpleRequest);
+        final CustomRequestBuilder<String> stringRequest = baseClient.customRequest("", String.class);
+        assertNotNull(stringRequest);
+    }
 }

From a39b80b249940d3a8c8377cef5976390f56919f9 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 11:13:09 -0500
Subject: [PATCH 087/213] - fixes a bug where upload sessions would not
 deserialize responses properly

---
 .../graph/concurrency/ChunkedUploadProvider.java         | 2 +-
 .../graph/concurrency/ChunkedUploadRequest.java          | 2 +-
 .../graph/concurrency/ChunkedUploadResponseHandler.java  | 9 ++++++---
 .../microsoft/graph/concurrency/ChunkedUploadResult.java | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
index 52caba689..a139885bd 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
@@ -128,7 +128,7 @@ public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
         this.inputStream = inputStream;
         this.streamSize = streamSize;
         this.uploadUrl = uploadSession.getUploadUrl();
-        this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass);
+        this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass, uploadSession.getClass());
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
index 87c37ed26..e0e0f861b 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -55,7 +55,7 @@ public class ChunkedUploadRequest<UploadType> {
      * @param totalLength The total length of the input stream.
      */
     @SuppressWarnings("unchecked")
-    public ChunkedUploadRequest(@Nonnull final String requestUrl,
+    protected ChunkedUploadRequest(@Nonnull final String requestUrl,
                                 @Nonnull final IBaseClient client,
                                 @Nullable final List<? extends Option> options,
                                 @Nonnull final byte[] chunk,
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index 123be3033..a0787b561 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -56,13 +56,16 @@ public class ChunkedUploadResponseHandler<UploadType>
 	 */
 	private final Class<UploadType> deserializeTypeClass;
 
+    private final Class<? extends IUploadSession> uploadSessionClass;
 	/**
 	 * Creates a chunked upload response handler
 	 *
 	 * @param uploadType the expected upload item type
+     * @param uploadSessionType the type of the upload session
 	 */
-	public ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType) {
-		this.deserializeTypeClass = uploadType;
+	protected ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType, @Nonnull final Class<? extends IUploadSession>  uploadSessionType) {
+        this.deserializeTypeClass = uploadType;
+        this.uploadSessionClass = uploadSessionType;
 	}
 
 	/**
@@ -107,7 +110,7 @@ public ChunkedUploadResult<UploadType> generateResult(
 				&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
 				try (final InputStream in = new BufferedInputStream(response.body().byteStream())) {
 					final String rawJson = CoreHttpProvider.streamToString(in);
-					final IUploadSession session = serializer.deserializeObject(rawJson, IUploadSession.class);
+					final IUploadSession session = serializer.deserializeObject(rawJson, uploadSessionClass);
 					if(session == null || session.getNextExpectedRanges() == null) {
 						logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
 						final UploadType uploadedItem = serializer.deserializeObject(rawJson, this.deserializeTypeClass);
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
index 40bd7d29a..81a5e1c72 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
@@ -34,7 +34,7 @@ public class ChunkedUploadResult<UploadType> {
      *
      * @param uploaded The created item.
      */
-    public ChunkedUploadResult(@Nullable final UploadType uploaded) {
+    protected ChunkedUploadResult(@Nullable final UploadType uploaded) {
         this.uploadedItem = uploaded;
         this.session = null;
         this.error = null;
@@ -45,7 +45,7 @@ public ChunkedUploadResult(@Nullable final UploadType uploaded) {
      *
      * @param session The next session.
      */
-    public ChunkedUploadResult(@Nullable final IUploadSession session) {
+    protected ChunkedUploadResult(@Nullable final IUploadSession session) {
         this.session = session;
         this.uploadedItem = null;
         this.error = null;
@@ -56,7 +56,7 @@ public ChunkedUploadResult(@Nullable final IUploadSession session) {
      *
      * @param error The error occurred during uploading.
      */
-    public ChunkedUploadResult(@Nullable final ClientException error) {
+    protected ChunkedUploadResult(@Nullable final ClientException error) {
         this.error = error;
         this.uploadedItem = null;
         this.session = null;
@@ -67,7 +67,7 @@ public ChunkedUploadResult(@Nullable final ClientException error) {
      *
      * @param exception The exception received from server.
      */
-    public ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
+    protected ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
         this(new ClientException(exception.getMessage(/* verbose */ true), exception));
     }
 

From ccf28214c5c291819c2ea408ee8454fb2fce0346 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 15:08:31 -0500
Subject: [PATCH 088/213] - updates future API surface following naming
 convention change

---
 .../concurrency/ChunkedUploadProvider.java    | 16 +++++++--------
 .../http/BaseActionCollectionRequest.java     |  4 ++--
 .../graph/http/BaseCollectionRequest.java     |  4 ++--
 .../http/BaseEntityCollectionRequest.java     |  4 ++--
 .../http/BaseFunctionCollectionRequest.java   |  4 ++--
 .../graph/http/BaseReferenceRequest.java      |  4 ++--
 .../com/microsoft/graph/http/BaseRequest.java |  4 ++--
 .../graph/http/BaseStreamRequest.java         |  8 ++++----
 .../http/BaseVoidActionCollectionRequest.java |  4 ++--
 .../graph/http/BaseWithReferenceRequest.java  | 16 +++++++--------
 .../graph/http/CoreHttpProvider.java          |  6 +++---
 .../microsoft/graph/http/CustomRequest.java   | 20 +++++++++----------
 .../microsoft/graph/http/IHttpProvider.java   |  4 ++--
 .../graph/http/PrimitiveRequest.java          |  4 ++--
 .../graph/core/GraphServiceClientTest.java    |  4 ++--
 .../graph/http/BaseRequestTests.java          |  2 +-
 .../graph/http/BaseStreamRequestTests.java    |  4 ++--
 17 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
index a139885bd..d3aafbbc3 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
@@ -141,7 +141,7 @@ public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
+    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
             throws IOException {
 
         int internalChunkSize = chunkSize;
@@ -213,9 +213,9 @@ private CompletableFuture<UploadType> failedFuture(ClientException ex) { // Comp
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> futureUpload()
+    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync()
     				throws IOException {
-    	return futureUpload(0);
+    	return uploadAsync(0);
     }
     /**
      * Uploads content to remote upload session based on the input stream
@@ -225,9 +225,9 @@ public java.util.concurrent.CompletableFuture<UploadType> futureUpload()
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable final int chunkSize)
+    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable final int chunkSize)
     				throws IOException {
-    	return futureUpload(chunkSize, null);
+    	return uploadAsync(chunkSize, null);
     }
     /**
      * Uploads content to remote upload session based on the input stream
@@ -238,9 +238,9 @@ public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable final int chunkSize, @Nullable final List<Option> options)
+    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options)
     				throws IOException {
-    	return futureUpload(chunkSize, options, null);
+    	return uploadAsync(chunkSize, options, null);
     }
 
     /**
@@ -256,7 +256,7 @@ public java.util.concurrent.CompletableFuture<UploadType> futureUpload(@Nullable
     public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
             throws IOException {
         try {
-            return futureUpload(chunkSize, options, progressCallback).get();
+            return uploadAsync(chunkSize, options, progressCallback).get();
         } catch (InterruptedException ex) {
             throw new ClientException("The request was interrupted", ex);
         } catch (ExecutionException ex) {
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
index a80058d24..b2d4b8afe 100644
--- a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
@@ -71,7 +71,7 @@ public BaseActionCollectionRequest(@Nonnull final String requestUrl,
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T3> futurePost() {
+    public java.util.concurrent.CompletableFuture<T3> postAsync() {
         getBaseRequest().setHttpMethod(HttpMethod.POST);
         Object bodyToSend = null;
         try {
@@ -82,7 +82,7 @@ public java.util.concurrent.CompletableFuture<T3> futurePost() {
         return getBaseRequest()
                             .getClient()
                             .getHttpProvider()
-                            .futureSend(this,
+                            .sendAsync(this,
                                 responseCollectionClass,
                                 bodyToSend)
                             .thenApply(r -> buildFromResponse(r));
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 5470eb417..901301d3d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -111,9 +111,9 @@ protected T2 send() throws ClientException {
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable
-    protected java.util.concurrent.CompletableFuture<T2> futureSend() throws ClientException {
+    protected java.util.concurrent.CompletableFuture<T2> sendAsync() throws ClientException {
         baseRequest.setHttpMethod(HttpMethod.GET);
-        return baseRequest.getClient().getHttpProvider().futureSend(this, responseCollectionClass, null);
+        return baseRequest.getClient().getHttpProvider().sendAsync(this, responseCollectionClass, null);
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
index 9ddf8a573..e0b405115 100644
--- a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
@@ -70,8 +70,8 @@ public BaseEntityCollectionRequest(@Nonnull final String requestUrl,
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T3> futureGet() {
-        return futureSend().thenApply(r -> buildFromResponse(r));
+    public java.util.concurrent.CompletableFuture<T3> getAsync() {
+        return sendAsync().thenApply(r -> buildFromResponse(r));
     }
     /**
      * Gets the collection of items
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
index 24dbfe5c7..c54e3c634 100644
--- a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
@@ -70,8 +70,8 @@ public BaseFunctionCollectionRequest(@Nonnull final String requestUrl,
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T3> futureGet() {
-        return futureSend().thenApply(r -> buildFromResponse(r));
+    public java.util.concurrent.CompletableFuture<T3> getAsync() {
+        return sendAsync().thenApply(r -> buildFromResponse(r));
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
index d353213fd..e93089a06 100644
--- a/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
@@ -55,8 +55,8 @@ public BaseReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBa
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futureDelete() {
-        return futureSend(HttpMethod.DELETE, null);
+    public java.util.concurrent.CompletableFuture<T> deleteAsync() {
+        return sendAsync(HttpMethod.DELETE, null);
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index 36b3a045c..d659e706a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -316,10 +316,10 @@ public boolean getUseCaches() {
      */
     @Nonnull
     @SuppressWarnings("unchecked")
-    protected <T1> java.util.concurrent.CompletableFuture<T> futureSend(@Nonnull final HttpMethod method,
+    protected <T1> java.util.concurrent.CompletableFuture<T> sendAsync(@Nonnull final HttpMethod method,
                                  @Nullable final T1 serializedObject) {
         this.method = method;
-        return (java.util.concurrent.CompletableFuture<T>) client.getHttpProvider().futureSend(this, responseClass, serializedObject);
+        return (java.util.concurrent.CompletableFuture<T>) client.getHttpProvider().sendAsync(this, responseClass, serializedObject);
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
index a3ac816b6..3da0141e8 100644
--- a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -74,9 +74,9 @@ public BaseStreamRequest(@Nonnull final String requestUrl,
      * @return a future with the result
      */
     @Nonnull
-    protected java.util.concurrent.CompletableFuture<InputStream> futureSend() {
+    protected java.util.concurrent.CompletableFuture<InputStream> sendAsync() {
         baseRequest.setHttpMethod(HttpMethod.GET);
-        return baseRequest.getClient().getHttpProvider().futureSend(this, InputStream.class, null);
+        return baseRequest.getClient().getHttpProvider().sendAsync(this, InputStream.class, null);
     }
 
     /**
@@ -99,9 +99,9 @@ protected InputStream send() throws ClientException {
      */
     @SuppressWarnings("unchecked")
     @Nonnull
-    protected java.util.concurrent.CompletableFuture<T> futureSend(@Nonnull final byte[] fileContents) {
+    protected java.util.concurrent.CompletableFuture<T> sendAsync(@Nonnull final byte[] fileContents) {
         baseRequest.setHttpMethod(HttpMethod.PUT);
-        return baseRequest.getClient().getHttpProvider().futureSend(this, (Class<T>) baseRequest.getResponseType(), fileContents);
+        return baseRequest.getClient().getHttpProvider().sendAsync(this, (Class<T>) baseRequest.getResponseType(), fileContents);
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
index bece62dcb..d358815c4 100644
--- a/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
@@ -71,7 +71,7 @@ public BaseVoidActionCollectionRequest(@Nonnull final String requestUrl,
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<Void> futurePost() {
+    public java.util.concurrent.CompletableFuture<Void> postAsync() {
         Object bodyToSend = null;
         try {
             bodyToSend = this.getClass().getField("body").get(this);
@@ -81,7 +81,7 @@ public java.util.concurrent.CompletableFuture<Void> futurePost() {
         return getBaseRequest()
                     .getClient()
                     .getHttpProvider()
-                    .futureSend(this,
+                    .sendAsync(this,
                         Void.class,
                         bodyToSend);
     }
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
index 921ff9db7..279b05078 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
@@ -60,8 +60,8 @@ public BaseWithReferenceRequest(@Nonnull final String requestUrl, @Nonnull final
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futurePost(@Nullable final T newEntity, @Nonnull final IJsonBackedObject payload) {
-        return futureSend(HttpMethod.POST, payload);
+    public java.util.concurrent.CompletableFuture<T> postAsync(@Nullable final T newEntity, @Nonnull final IJsonBackedObject payload) {
+        return sendAsync(HttpMethod.POST, payload);
     }
 
     /**
@@ -85,8 +85,8 @@ public T post(@Nonnull final T newEntity, @Nonnull final IJsonBackedObject paylo
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futureGet() {
-        return futureSend(HttpMethod.GET, null);
+    public java.util.concurrent.CompletableFuture<T> getAsync() {
+        return sendAsync(HttpMethod.GET, null);
     }
 
     /**
@@ -103,8 +103,8 @@ public T get() throws ClientException {
      * @return a future with the result
      */
     @Nonnull
-	public java.util.concurrent.CompletableFuture<T> futureDelete() {
-		return futureSend(HttpMethod.DELETE, null);
+	public java.util.concurrent.CompletableFuture<T> deleteAsync() {
+		return sendAsync(HttpMethod.DELETE, null);
 	}
 
     /**
@@ -121,8 +121,8 @@ public void delete() throws ClientException {
      * @return a future with the result
      */
     @Nonnull
-	public java.util.concurrent.CompletableFuture<T> futurePatch(@Nonnull final T sourceObject) {
-		return futureSend(HttpMethod.PATCH, sourceObject);
+	public java.util.concurrent.CompletableFuture<T> patchAsync(@Nonnull final T sourceObject) {
+		return sendAsync(HttpMethod.PATCH, sourceObject);
 	}
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index e975a02b2..bf68be52f 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -129,10 +129,10 @@ public ISerializer getSerializer() {
 	 */
 	@Override
 	@Nullable
-	public <Result, Body> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+	public <Result, Body> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable) {
-		return futureSend(request,
+		return sendAsync(request,
 							resultClass,
 							serializable,
 							null);
@@ -151,7 +151,7 @@ public <Result, Body> java.util.concurrent.CompletableFuture<Result> futureSend(
      * @throws ClientException  this exception occurs if the request was unable to complete for any reason
      */
     @Nullable
-    public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+    public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
                                                     @Nonnull final Class<Result> resultClass,
                                                     @Nullable final BodyType serializable,
                                                     @Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler)
diff --git a/src/main/java/com/microsoft/graph/http/CustomRequest.java b/src/main/java/com/microsoft/graph/http/CustomRequest.java
index 714054bb6..31be6256c 100644
--- a/src/main/java/com/microsoft/graph/http/CustomRequest.java
+++ b/src/main/java/com/microsoft/graph/http/CustomRequest.java
@@ -80,8 +80,8 @@ public T get() throws ClientException {
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futureGet() {
-    	return futureSend(HttpMethod.GET, null);
+    public java.util.concurrent.CompletableFuture<T> getAsync() {
+    	return sendAsync(HttpMethod.GET, null);
     }
 
     /**
@@ -90,8 +90,8 @@ public java.util.concurrent.CompletableFuture<T> futureGet() {
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futureDelete() {
-        return futureSend(HttpMethod.DELETE, null);
+    public java.util.concurrent.CompletableFuture<T> deleteAsync() {
+        return sendAsync(HttpMethod.DELETE, null);
     }
 
     /**
@@ -109,8 +109,8 @@ public void delete() throws ClientException {
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futurePatch() {
-        return futureSend(HttpMethod.PATCH, super.getResponseType());
+    public java.util.concurrent.CompletableFuture<T> patchAsync() {
+        return sendAsync(HttpMethod.PATCH, super.getResponseType());
     }
 
     /**
@@ -132,8 +132,8 @@ public T patch(@Nonnull final T sourceObject) throws ClientException {
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futurePost(@Nonnull final T newObject) {
-        return futureSend(HttpMethod.POST, newObject);
+    public java.util.concurrent.CompletableFuture<T> postAsync(@Nonnull final T newObject) {
+        return sendAsync(HttpMethod.POST, newObject);
     }
 
     /**
@@ -155,8 +155,8 @@ public T post(@Nonnull final T newObject) throws ClientException {
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futurePut(@Nonnull final T putObject) {
-        return futureSend(HttpMethod.PUT, putObject);
+    public java.util.concurrent.CompletableFuture<T> putAsync(@Nonnull final T putObject) {
+        return sendAsync(HttpMethod.PUT, putObject);
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/IHttpProvider.java b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
index 6bb3f7edd..00d0abe27 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
@@ -57,7 +57,7 @@ public interface IHttpProvider {
      * @return a future with the result
      */
     @Nonnull
-    <Result, BodyType> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+    <Result, BodyType> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
                                  @Nonnull final Class<Result> resultClass,
                                  @Nullable final BodyType serializable);
 
@@ -75,7 +75,7 @@ <Result, BodyType> java.util.concurrent.CompletableFuture<Result> futureSend(@No
      * @throws ClientException  this exception occurs if the request was unable to complete for any reason
      */
     @Nullable
-    <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> futureSend(@Nonnull final IHttpRequest request,
+    <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
                                                     @Nonnull final Class<Result> resultClass,
                                                     @Nullable final BodyType serializable,
                                                     @Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler)
diff --git a/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java b/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
index eeb5685ae..b50ffc1a5 100644
--- a/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
+++ b/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
@@ -54,8 +54,8 @@ public PrimitiveRequest(@Nonnull final String requestUrl, @Nonnull final IBaseCl
      * @return a future with the result
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<T> futureGet() {
-        return futureSend(HttpMethod.GET, null);
+    public java.util.concurrent.CompletableFuture<T> getAsync() {
+        return sendAsync(HttpMethod.GET, null);
     }
 
     /**
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index 4d8695a30..c16e81afb 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -107,12 +107,12 @@ public ISerializer getSerializer() {
             }
 
             @Override
-            public <Result, BodyType> java.util.concurrent.CompletableFuture<Result> futureSend(IHttpRequest request, Class<Result> resultClass, BodyType serializable) {
+            public <Result, BodyType> java.util.concurrent.CompletableFuture<Result> sendAsync(IHttpRequest request, Class<Result> resultClass, BodyType serializable) {
                 return null;
             }
 
             @Override
-            public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> futureSend(IHttpRequest request, Class<Result> resultClass, BodyType serializable, final IStatefulResponseHandler<Result, DeserializeType> handler) {
+            public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendAsync(IHttpRequest request, Class<Result> resultClass, BodyType serializable, final IStatefulResponseHandler<Result, DeserializeType> handler) {
                 return null;
             }
 
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index 544cd6a75..45e446be8 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -71,7 +71,7 @@ public void testSend() {
 
     @Test
     public void testSendWithCallback() throws InterruptedException, ExecutionException {
-        final java.util.concurrent.CompletableFuture<JsonObject> result = mRequest.futureSend(HttpMethod.GET, null);
+        final java.util.concurrent.CompletableFuture<JsonObject> result = mRequest.sendAsync(HttpMethod.GET, null);
         assertNotNull(result.get());
         assertTrue(result.isDone());
         assertFalse(result.isCancelled());
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
index 13b06fdf9..8131cf78b 100644
--- a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -87,7 +87,7 @@ public void testSendWithCallback() throws IOException, InterruptedException, Exe
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
         final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
-        final java.util.concurrent.CompletableFuture<InputStream> result = request.futureSend();
+        final java.util.concurrent.CompletableFuture<InputStream> result = request.sendAsync();
         assertNotNull(result.get());
         assertTrue(result.isDone());
         assertFalse(result.isCancelled());
@@ -111,7 +111,7 @@ public void testSendWithContentAndCallback() throws IOException, InterruptedExce
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
         final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
-        final java.util.concurrent.CompletableFuture<InputStream> result = request.futureSend(new byte[]{1, 2, 3, 4});
+        final java.util.concurrent.CompletableFuture<InputStream> result = request.sendAsync(new byte[]{1, 2, 3, 4});
         assertNotNull(result.get());
         assertTrue(result.isDone());
         assertFalse(result.isCancelled());

From 96a88815f065f5708672fb829614bf313e475efa Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 19 Jan 2021 16:11:02 -0500
Subject: [PATCH 089/213] - merges CoreAuthProvider and auth provider
 interfaces

---
 .../IAuthenticationProvider.java              | 15 ++++++++--
 .../ICoreAuthenticationProvider.java          | 21 --------------
 .../TokenCredentialAuthProvider.java          |  7 ++---
 .../com/microsoft/graph/core/BaseClient.java  | 29 ++++++++++---------
 .../graph/httpcore/AuthenticationHandler.java |  6 ++--
 .../microsoft/graph/httpcore/HttpClients.java |  5 ++--
 .../graph/core/GraphServiceClientTest.java    | 13 ++++-----
 .../httpcore/AuthenticationHandlerTest.java   | 15 ++++------
 .../graph/httpcore/HttpClientsTest.java       | 22 ++++----------
 .../graph/httpcore/TelemetryHandlerTest.java  | 20 ++++---------
 10 files changed, 61 insertions(+), 92 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java

diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index 37dd4d4e2..ac64b80e8 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -5,13 +5,24 @@
 import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.IHttpRequest;
 
-public interface IAuthenticationProvider {
 
+/**
+ * Authenticates requests to be sent to the API
+ * @param <NativeRequestType> the type of the http native http request from the http client library
+ */
+public interface IAuthenticationProvider<NativeRequestType> {
     /**
      * Authenticates the request
      *
      * @param request the request to authenticate
      */
     void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException;
-
+    /**
+     * Authenticates the request
+     *
+     * @param request the request to authenticate
+     * @return Request with Authorization header added to it
+     */
+    @Nonnull
+    NativeRequestType authenticateRequest(@Nonnull final NativeRequestType request) throws AuthenticationException;
 }
diff --git a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
deleted file mode 100644
index f6d747cd2..000000000
--- a/src/main/java/com/microsoft/graph/authentication/ICoreAuthenticationProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.microsoft.graph.authentication;
-
-import okhttp3.Request;
-
-import javax.annotation.Nonnull;
-
-import com.microsoft.graph.exceptions.AuthenticationException;
-
-/**
- * Authenticates requests to be sent to the API
- */
-public interface ICoreAuthenticationProvider {
-    /**
-     * Authenticates the request
-     *
-     * @param request the request to authenticate
-     * @return Request with Authorization header added to it
-     */
-    @Nonnull
-    Request authenticateRequest(@Nonnull final Request request) throws AuthenticationException;
-}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 4ac43cbe7..6d5c4965e 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -20,7 +20,7 @@
 
 import javax.annotation.Nonnull;
 
-public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider , IAuthenticationProvider {
+public class TokenCredentialAuthProvider implements IAuthenticationProvider<Request> {
 
     //TokenCredential expected from user
     private TokenCredential tokenCredential;
@@ -29,7 +29,7 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
     // maximum delay to wait for token obtention
     private Duration tokenBlockTimeout;
 
-    
+
     //TODO: Upon further review from Peter, this should include a Null check in the case that this is the first request
     //There should be just one constructor as scopes should probably not be optional
     /**
@@ -38,7 +38,7 @@ public class TokenCredentialAuthProvider implements ICoreAuthenticationProvider
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
-    public  TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
+    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
         if(tokenCredential == null) {
             throw new AuthenticationException(new Error(Codes.InvalidArgument,
                     String.format(Messages.NullParameter, "TokenCredential"))
@@ -115,7 +115,6 @@ private boolean ShouldAuthenticateRequest(@Nonnull final String requestUrl) {
         } catch (MalformedURLException ex) {
             return false;
         }
-        
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index a08d4a886..c28563011 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -26,7 +26,7 @@
 import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.httpcore.HttpClients;
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.DefaultSerializer;
@@ -36,6 +36,7 @@
 import javax.annotation.Nonnull;
 
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 /**
  * A client that communications with an OData service
@@ -104,23 +105,25 @@ public CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url)
 	 * @return builder to start configuring the client
 	 */
 	@Nonnull
-	public static Builder<OkHttpClient> builder() {
-		return new Builder<OkHttpClient>();
+	public static Builder<OkHttpClient, Request> builder() {
+		return new Builder<>();
 	}
 
 	/**
 	 * Builder to help configure the Graph service client
+     * @param <httpClientType> type of the native http library client
+     * @param <httpRequestType> type of the native http library request
 	 */
-	public static class Builder<httpClientType> {
+	public static class Builder<httpClientType, httpRequestType> {
 		private ISerializer serializer;
 		private IHttpProvider httpProvider;
 		private ILogger logger;
 		private httpClientType httpClient;
-		private ICoreAuthenticationProvider auth;
+		private IAuthenticationProvider<httpRequestType> auth;
 
-		private ICoreAuthenticationProvider getAuthenticationProvider() {
+		private IAuthenticationProvider<httpRequestType> getAuthenticationProvider() {
 			if(auth == null) {
-				throw new NullPointerException("auth"); // TODO initialize to default once moved to core
+				throw new NullPointerException("auth");
 			} else {
 				return auth;
 			}
@@ -142,7 +145,7 @@ private ISerializer getSerializer() {
 		@SuppressWarnings("unchecked")
 		private httpClientType getHttpClient() {
 			if(httpClient == null) {
-				return (httpClientType)HttpClients.createDefault(getAuthenticationProvider());
+				return (httpClientType)HttpClients.createDefault((IAuthenticationProvider<Request>)getAuthenticationProvider());
 			} else {
 				return httpClient;
 			}
@@ -163,7 +166,7 @@ private IHttpProvider getHttpProvider() {
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
+		public Builder<httpClientType, httpRequestType> serializer(@Nonnull final ISerializer serializer) {
 			checkNotNull(serializer, "serializer");
 			this.serializer = serializer;
 			return this;
@@ -177,7 +180,7 @@ public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer)
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
+		public Builder<httpClientType, httpRequestType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
 			checkNotNull(httpProvider, "httpProvider");
 			this.httpProvider = httpProvider;
 			return this;
@@ -191,7 +194,7 @@ public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpPro
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
+		public Builder<httpClientType, httpRequestType> logger(@Nonnull final ILogger logger) {
 			checkNotNull(logger, "logger");
 			this.logger = logger;
 			return this;
@@ -205,7 +208,7 @@ public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
+		public Builder<httpClientType, httpRequestType> httpClient(@Nonnull final httpClientType client) {
 			checkNotNull(client, "client");
 			this.httpClient = client;
 			return this;
@@ -218,7 +221,7 @@ public Builder<httpClientType> httpClient(@Nonnull final httpClientType client)
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthenticationProvider auth) {
+		public Builder<httpClientType, httpRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider<httpRequestType> auth) {
 			checkNotNull(auth, "auth");
 			this.auth = auth;
 			return this;
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index 4498c237c..26a1aa5d9 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.exceptions.AuthenticationException;
 
 import javax.annotation.Nullable;
@@ -25,13 +25,13 @@ public class AuthenticationHandler implements Interceptor {
      */
     public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.AUTHENTICATION;
 
-    private ICoreAuthenticationProvider authProvider;
+    private IAuthenticationProvider<Request> authProvider;
 
     /**
      * Initialize a the handler with a authentication provider
      * @param authProvider the authentication provider to use
      */
-    public AuthenticationHandler(@Nonnull final ICoreAuthenticationProvider authProvider) {
+    public AuthenticationHandler(@Nonnull final IAuthenticationProvider<Request> authProvider) {
         this.authProvider = authProvider;
     }
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index 125478bb5..5d8b8fa29 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -1,6 +1,6 @@
 package com.microsoft.graph.httpcore;
 
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 
 import java.util.Arrays;
 
@@ -10,6 +10,7 @@
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
+import okhttp3.Request;
 import okhttp3.OkHttpClient.Builder;
 
 /**
@@ -42,7 +43,7 @@ public static Builder custom() {
      * @return OkHttpClient build with authentication provider given, default redirect and default retry handlers
      */
     @Nonnull
-    public static OkHttpClient createDefault(@Nonnull final ICoreAuthenticationProvider auth) {
+    public static OkHttpClient createDefault(@Nonnull final IAuthenticationProvider<Request> auth) {
         return custom()
                 .addInterceptor(new AuthenticationHandler(auth))
                 .addInterceptor(new RetryHandler())
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index 6e552da91..a3f72ae3d 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
 
 import java.util.List;
 import java.util.Map;
@@ -14,20 +15,16 @@
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.http.IStatefulResponseHandler;
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.logger.LoggerLevel;
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
 public class GraphServiceClientTest {
-    private ICoreAuthenticationProvider getAuthProvider() {
-        return new ICoreAuthenticationProvider() {
-            @Override
-            public Request authenticateRequest(Request request) {
-                return request;
-            }
-        };
+    @SuppressWarnings("unchecked")
+    private IAuthenticationProvider<Request> getAuthProvider() {
+        return mock(IAuthenticationProvider.class);
     }
 
     @Test
diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index 852fe799e..07db2a041 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -1,12 +1,9 @@
 package com.microsoft.graph.httpcore;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -14,17 +11,17 @@
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 
 public class AuthenticationHandlerTest {
     @Test
+    @SuppressWarnings("unchecked")
     public void testAuthenticationHandler() throws Exception {
-        ICoreAuthenticationProvider authProvider = mock(ICoreAuthenticationProvider.class);
+        IAuthenticationProvider<Request> authProvider = mock(IAuthenticationProvider.class);
         AuthenticationHandler authHandler = new AuthenticationHandler(authProvider);
         Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
         OkHttpClient client = new OkHttpClient().newBuilder().addInterceptor(authHandler).build();
-        Response response = client.newCall(request).execute();
-        verify(authProvider, times(1)).authenticateRequest(anyObject());
+        client.newCall(request).execute();
+        verify(authProvider, times(1)).authenticateRequest(any(Request.class));
     }
 
 }
diff --git a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
index 163e430c1..defa43c8f 100644
--- a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
@@ -1,37 +1,27 @@
 package com.microsoft.graph.httpcore;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 import org.junit.Test;
 
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
 
 public class HttpClientsTest {
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testHttpClientCreation() {
-        ICoreAuthenticationProvider authprovider = new ICoreAuthenticationProvider() {
-            public Request authenticateRequest(Request request) {
-                Request newRequest = request.newBuilder().addHeader("Authorization", "Bearer " + "TOKEN").build();
-                return newRequest;
-            }
-        };
-
-        OkHttpClient httpclient = HttpClients.createDefault(authprovider);
+        OkHttpClient httpclient = HttpClients.createDefault(mock(IAuthenticationProvider.class));
         assertTrue(httpclient != null);
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void arrayInterceptorsTest() {
-        AuthenticationHandler authenticationHandler = new AuthenticationHandler(new ICoreAuthenticationProvider() {
-            @Override
-            public Request authenticateRequest(Request request) {
-                return request;
-            }
-        });
+        AuthenticationHandler authenticationHandler = new AuthenticationHandler(mock(IAuthenticationProvider.class));
         Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
         OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
         assertTrue(client.interceptors().size()==4);
diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
index fa08ec3bf..e77611054 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
@@ -2,10 +2,11 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
 
-import com.microsoft.graph.authentication.ICoreAuthenticationProvider;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
 import org.junit.Test;
 
 import okhttp3.Interceptor;
@@ -21,15 +22,11 @@ public void telemetryInitTest() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void interceptTest() throws IOException {
         final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
                 +TelemetryHandler.VERSION;
-        final OkHttpClient client = HttpClients.createDefault(new ICoreAuthenticationProvider() {
-            @Override
-            public Request authenticateRequest(Request request) {
-                return request;
-            }
-        });
+        final OkHttpClient client = HttpClients.createDefault(mock(IAuthenticationProvider.class));
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
         final Response response = client.newCall(request).execute();
         assertNotNull(response);
@@ -39,15 +36,10 @@ public Request authenticateRequest(Request request) {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void arrayInterceptorsTest() throws IOException {
 
-        final AuthenticationHandler authenticationHandler = new AuthenticationHandler(new ICoreAuthenticationProvider() {
-
-            @Override
-            public Request authenticateRequest(Request request) {
-                return request;
-            }
-        });
+        final AuthenticationHandler authenticationHandler = new AuthenticationHandler(mock(IAuthenticationProvider.class));
         final Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
         final OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
         final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"

From 985b47975487cc5b5f3c8aad6cf5263b3399efed Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 20 Jan 2021 10:45:10 -0500
Subject: [PATCH 090/213] - adds missing javadoc comments - remove unecessary
 manual mocks - removes duplicated constructs following move from service
 library

---
 .../graph/authentication/AuthConstants.java   |  25 +--
 .../IAuthenticationProvider.java              |   2 +-
 .../TokenCredentialAuthProvider.java          |  14 +-
 .../exceptions/AuthenticationException.java   |  30 ++--
 .../com/microsoft/graph/exceptions/Error.java |  89 -----------
 .../graph/exceptions/ErrorConstants.java      |  21 ---
 .../microsoft/graph/httpcore/HttpMethod.java  |  28 ----
 .../graph/httpcore/IHttpRequest.java          | 144 ------------------
 .../TokenCredentialAuthProviderTest.java      |  46 ++++--
 .../microsoft/graph/core/BaseClientTests.java |   1 -
 .../graph/mocks/MockIHttpRequest.java         | 121 ---------------
 11 files changed, 72 insertions(+), 449 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/exceptions/Error.java
 delete mode 100644 src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
 delete mode 100644 src/main/java/com/microsoft/graph/httpcore/HttpMethod.java
 delete mode 100644 src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
 delete mode 100644 src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java

diff --git a/src/main/java/com/microsoft/graph/authentication/AuthConstants.java b/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
index 1a0233df3..c2bae6797 100644
--- a/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
+++ b/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
@@ -1,14 +1,17 @@
 package com.microsoft.graph.authentication;
 
-public class AuthConstants {
+import com.google.common.annotations.VisibleForTesting;
 
-    public static class Tenants
-    {
-        public static final String Common = "common";
-        public static final String Organizations = "organizations";
-        public static final String Consumers = "consumers";
-    }
-    public static final String BEARER = "Bearer ";
-    public static final String TOKEN_ENDPOINT = "/oauth2/v2.0/token";
-    public static final String AUTHORIZATION_HEADER = "Authorization";
-}
\ No newline at end of file
+/**
+ * Internal only.
+ * Constants in use for the authentication provider
+ */
+@VisibleForTesting
+class AuthConstants {
+    /** The bearer value for the authorization request header, contains a space */
+    @VisibleForTesting
+    protected static final String BEARER = "Bearer ";
+    /** The authorization request header name */
+    @VisibleForTesting
+    protected static final String AUTHORIZATION_HEADER = "Authorization";
+}
diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index ac64b80e8..cb1691bf4 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -3,7 +3,7 @@
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.httpcore.IHttpRequest;
+import com.microsoft.graph.http.IHttpRequest;
 
 
 /**
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 6d5c4965e..8334b1774 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -4,11 +4,8 @@
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
 import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.exceptions.Error;
-import com.microsoft.graph.exceptions.ErrorConstants;
-import com.microsoft.graph.httpcore.IHttpRequest;
+import com.microsoft.graph.http.IHttpRequest;
 import okhttp3.Request;
-import com.microsoft.graph.exceptions.ErrorConstants.*;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -20,6 +17,9 @@
 
 import javax.annotation.Nonnull;
 
+/**
+ * An implementation of the Authentication Provider with Azure-identity
+ */
 public class TokenCredentialAuthProvider implements IAuthenticationProvider<Request> {
 
     //TokenCredential expected from user
@@ -40,9 +40,7 @@ public class TokenCredentialAuthProvider implements IAuthenticationProvider<Requ
      */
     public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
         if(tokenCredential == null) {
-            throw new AuthenticationException(new Error(Codes.InvalidArgument,
-                    String.format(Messages.NullParameter, "TokenCredential"))
-                    ,new IllegalArgumentException());
+            throw new AuthenticationException(new IllegalArgumentException("tokenCredential parameter cannot be null."));
         }
 
         this.tokenCredential = tokenCredential;
@@ -127,7 +125,7 @@ private String getAccessToken() throws AuthenticationException {
             final AccessToken token = this.tokenCredential.getToken(this.context).block(this.tokenBlockTimeout);
             return token.getToken();
         } catch (RuntimeException e) {
-            throw new AuthenticationException(new Error(ErrorConstants.Codes.GeneralException, ErrorConstants.Messages.AuthTimeOut), e);
+            throw new AuthenticationException("Authentication failed or timed out.", e);
         }
     }
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
index f5ccb9865..8e4ef9abf 100644
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
@@ -2,34 +2,32 @@
 
 import javax.annotation.Nonnull;
 
-public class AuthenticationException extends Exception{
+import com.microsoft.graph.core.ClientException;
+
+/**
+ * Exceptions thrown by the authentication provider when the authentication sequence has failed
+ */
+public class AuthenticationException extends ClientException {
 
     /**
      * serial id
      */
     private static final long serialVersionUID = 8708883112518988965L;
-    // Error object to store details of thrown Exception
-    @Nonnull
-    public Error error;
-
     /**
-     *Creates a new AuthenticationException with a specified Error
+     * Creates a new AuthenticationException with a specified Error as well as an inner exception
      *
-     * @param error The specifying error causing exception to be thrown
+     * @param message The specified error message causing exception to be thrown
+     * @param rootCause The underlying exception causing AuthenticationException to be thrown
      */
-    public AuthenticationException(@Nonnull final Error error) {
-        super(error.getMessage());
-        this.error = error;
+    public AuthenticationException(@Nonnull final String message, @Nonnull final Throwable rootCause) {
+        super(message, rootCause);
     }
-
     /**
-     *Creates a new AuthenticationException with a specified Error as well as an inner exception
+     * Creates a new AuthenticationException with a specified Error as well as an inner exception
      *
-     * @param error The specified error causing exception to be thrown
      * @param rootCause The underlying exception causing AuthenticationException to be thrown
      */
-    public AuthenticationException(@Nonnull final Error error, @Nonnull final Throwable rootCause) {
-        super(error.getMessage(), rootCause);
-        this.error = error;
+    public AuthenticationException(@Nonnull final Throwable rootCause) {
+        super(rootCause.getMessage(), rootCause);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/exceptions/Error.java b/src/main/java/com/microsoft/graph/exceptions/Error.java
deleted file mode 100644
index 4dcaea94a..000000000
--- a/src/main/java/com/microsoft/graph/exceptions/Error.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.microsoft.graph.exceptions;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-public class Error {
-
-    //Error Code specifying error type
-    @Nullable
-    public String Code;
-    //Error Message describing error
-    @Nonnull
-    public String Message;
-
-    /**
-     * Creates a new error with a specified message and code
-     *
-     * @param code The specified error code
-     * @param message The specified error message
-     */
-    public Error(@Nonnull final String code, @Nonnull final String message) {
-        this.Code = code;
-        this.Message = message;
-    }
-
-    /**
-     * Creates a new error with a specified message
-     *
-     * @param message The specified error message
-     */
-    public Error(@Nonnull final String message)
-    {
-        this.Message = message;
-    }
-
-    /**
-     * Get the error message
-     *
-     * @return the error message
-     */
-    @Nonnull
-    public String getMessage(){return this.Message;}
-
-    /**
-     * Get the error code
-     *
-     * @return the error code
-     */
-    @Nullable
-    public String getCode(){return this.Code;}
-
-    /**
-     * Set the error message
-     *
-     * @param message the error message
-     */
-    public void setMessage(@Nonnull final String message){ this.Message = message; }
-
-    /**
-     * Set the error code
-     *
-     * @param code the error code
-     */
-    public void setCode(@Nonnull final String code) { this.Code = code; }
-
-    /**
-     * Returns a string with the specified error details
-     *
-     * @return the error details as a String
-     */
-    @Nonnull
-    public String toString() {
-        StringBuilder errorString = new StringBuilder();
-
-        if(this.Code != null) {
-            errorString.append(String.format("Code: %s", this.Code));
-            errorString.append(System.lineSeparator());
-        }
-
-        if(this.Message != null){
-            errorString.append(String.format("Message: %s", this.Message));
-            errorString.append(System.lineSeparator());
-        }
-
-        return errorString.toString();
-    }
-}
-
-
diff --git a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java b/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
deleted file mode 100644
index e2392fe57..000000000
--- a/src/main/java/com/microsoft/graph/exceptions/ErrorConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.microsoft.graph.exceptions;
-
-import javax.annotation.Nonnull;
-
-public final class ErrorConstants {
-
-    public static class Codes {
-        @Nonnull
-        public final static String GeneralException = "generalException";
-        @Nonnull
-        public final static String InvalidArgument = "invalidArgument";
-
-    }
-
-    public static class Messages {
-        @Nonnull
-        public final static String NullParameter = "%s parameter cannot be null.";
-        @Nonnull
-        public final static String AuthTimeOut = "Authentication failed or timed out.";
-    }
-}
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpMethod.java b/src/main/java/com/microsoft/graph/httpcore/HttpMethod.java
deleted file mode 100644
index 878e487ac..000000000
--- a/src/main/java/com/microsoft/graph/httpcore/HttpMethod.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.microsoft.graph.httpcore;
-
-public enum HttpMethod {
-    /**
-     * Get
-     */
-    GET,
-
-    /**
-     * Post
-     */
-    POST,
-
-    /**
-     * Patch
-     */
-    PATCH,
-
-    /**
-     * Delete
-     */
-    DELETE,
-
-    /**
-     * Put
-     */
-    PUT,
-}
diff --git a/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java b/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
deleted file mode 100644
index b3b48c00c..000000000
--- a/src/main/java/com/microsoft/graph/httpcore/IHttpRequest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.microsoft.graph.httpcore;
-
-import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
-import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
-import com.microsoft.graph.options.HeaderOption;
-import com.microsoft.graph.options.Option;
-
-import java.net.URL;
-import java.util.List;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-/**
- * An HTTP request
- */
-public interface IHttpRequest {
-
-    /**
-     * Gets the request URL
-     *
-     * @return the request URL
-     */
-    @Nullable
-    URL getRequestUrl();
-
-    /**
-     * Gets the HTTP method
-     *
-     * @return the HTTP method
-     */
-    @Nullable
-    HttpMethod getHttpMethod();
-
-    /**
-     * Gets the headers
-     *
-     * @return the headers
-     */
-    @Nullable
-    List<HeaderOption> getHeaders();
-
-    /**
-     * Gets the options
-     *
-     * @return the options
-     */
-    @Nullable
-    List<Option> getOptions();
-
-    /**
-     * Adds a header to this request
-     *
-     * @param header the name of the header
-     * @param value  the value of the header
-     */
-    void addHeader(@Nonnull final String header, @Nonnull final String value);
-
-    /**
-     * Sets useCaches parameter to cache the response
-     *
-     * @param useCaches the value of useCaches
-     */
-    void setUseCaches(boolean useCaches);
-
-    /**
-     * Gets useCaches parameter
-     *
-     * @return the value of useCaches
-     */
-    boolean getUseCaches();
-
-    /**
-     * Sets the max redirects
-     *
-     * @param maxRedirects Max redirects that a request can take
-     */
-    void setMaxRedirects(int maxRedirects);
-
-    /**
-     * Gets the max redirects
-     *
-     * @return Max redirects that a request can take
-     */
-    int getMaxRedirects();
-
-    /**
-     * Sets the should redirect callback
-     *
-     * @param shouldRedirect Callback called before doing a redirect
-     */
-    void setShouldRedirect(@Nonnull final IShouldRedirect shouldRedirect);
-
-    /**
-     * Gets the should redirect callback
-     *
-     * @return Callback which is called before redirect
-     */
-    @Nullable
-    IShouldRedirect getShouldRedirect();
-
-    /**
-     * Sets the should retry callback
-     *
-     * @param shouldretry The callback called before retry
-     */
-    void setShouldRetry(@Nonnull final IShouldRetry shouldretry);
-
-    /**
-     * Gets the should retry callback
-     *
-     * @return Callback called before retry
-     */
-    @Nullable
-    IShouldRetry getShouldRetry();
-
-    /**
-     * Sets the max retries
-     *
-     * @param maxRetries Max retries for a request
-     */
-    void setMaxRetries(int maxRetries);
-
-    /**
-     * Gets max retries
-     *
-     * @return Max retries for a request
-     */
-    int getMaxRetries();
-
-    /**
-     * Sets the delay in seconds between retires
-     *
-     * @param delay Delay in seconds between retries
-     */
-    void setDelay(long delay);
-
-    /**
-     * Gets delay between retries
-     *
-     * @return Delay between retries in seconds
-     */
-    long getDelay();
-}
\ No newline at end of file
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 300128b40..091874dc7 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -2,13 +2,26 @@
 
 import com.azure.core.credential.TokenCredential;
 import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.mocks.MockIHttpRequest;
+import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.mocks.MockTokenCredential;
+import com.microsoft.graph.options.HeaderOption;
+
 import okhttp3.Request;
 import org.junit.Assert;
 import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 
 public class TokenCredentialAuthProviderTest {
 
@@ -17,32 +30,45 @@ public class TokenCredentialAuthProviderTest {
     @Test
     public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
 
-        //Arrange
+        // Arrange
         final Request request = new Request.Builder().url("https://graph.microsoft.com").build();
         final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
-        //Act
+        // Act
         Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
         final Request authenticatedRequest = authProvider.authenticateRequest(request);
 
-        //Assert
+        // Assert
         Assert.assertEquals(request.url(), authenticatedRequest.url());
         Assert.assertNotNull(authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
         assertEquals(AuthConstants.BEARER + testToken, authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
     }
 
     @Test
-    public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException {
+    public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException, MalformedURLException {
 
-        //Arrange
+        // Arrange
         final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        final MockIHttpRequest request = new MockIHttpRequest("https://graph.microsoft.com");
+        final IHttpRequest request = mock(IHttpRequest.class);
+        final List<HeaderOption> headersOptions = new ArrayList<>();
+        when(request.getRequestUrl()).thenReturn(new URL("https://graph.microsoft.com"));
+        doAnswer(new Answer<Void>() {
+
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                headersOptions.add(new HeaderOption((String)invocation.getArguments()[0], (String)invocation.getArguments()[1]));
+                return null;
+            }
+
+        }).when(request).addHeader(any(String.class), any(String.class));
+        when(request.getHeaders()).thenReturn(headersOptions);
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         //Act
         Assert.assertTrue(request.getHeaders().isEmpty());
         authProvider.authenticateRequest(request);
+        Assert.assertFalse(request.getHeaders().isEmpty());
 
         //Assert
         Assert.assertTrue(request.getHeaders().get(0).getName().equals(AuthConstants.AUTHORIZATION_HEADER));
@@ -66,11 +92,13 @@ public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreA
     }
 
     @Test
-    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestIAuthentication() throws AuthenticationException {
+    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestIAuthentication() throws AuthenticationException,
+            MalformedURLException {
 
         //Arrange
         final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        final MockIHttpRequest request = new MockIHttpRequest("https://localhost");
+        final IHttpRequest request = mock(IHttpRequest.class);
+        when(request.getRequestUrl()).thenReturn(new URL("https://localhost"));
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         //Act
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index f8f6b309a..4b9da6dcb 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -5,7 +5,6 @@
 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;
diff --git a/src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java b/src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java
deleted file mode 100644
index 26fdd9ad3..000000000
--- a/src/test/java/com/microsoft/graph/mocks/MockIHttpRequest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.microsoft.graph.mocks;
-
-import java.net.URI;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.microsoft.graph.httpcore.HttpMethod;
-import com.microsoft.graph.httpcore.IHttpRequest;
-import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
-import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
-import com.microsoft.graph.options.HeaderOption;
-import com.microsoft.graph.options.Option;
-
-
-/**
- * Dummy class implementing IHttpRequest used for testing
- */
-public class MockIHttpRequest implements IHttpRequest {
-
-    private final List<HeaderOption> headersOptions;
-    private String requestUrl;
-
-    public MockIHttpRequest(String requestUrl)
-    {
-        headersOptions = new ArrayList<>();
-        this.requestUrl = requestUrl;
-    }
-
-    @Override
-    public URL getRequestUrl() {
-        URI baseUrl = URI.create(requestUrl);
-        try {
-            return new URL(baseUrl.toString());
-        } catch (final MalformedURLException e) {
-        }
-        return null;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return null;
-    }
-
-    @Override
-    public List<HeaderOption> getHeaders() {
-        return headersOptions;
-    }
-
-    @Override
-    public List<Option> getOptions() {
-        return null;
-    }
-
-    @Override
-    public void addHeader(final String header, final String value) {
-        headersOptions.add(new HeaderOption(header, value));
-    }
-
-
-    @Override
-    public void setUseCaches(boolean useCaches) {
-
-    }
-
-    @Override
-    public boolean getUseCaches() {
-        return false;
-    }
-
-    @Override
-    public void setMaxRedirects(int maxRedirects) {
-
-    }
-
-    @Override
-    public int getMaxRedirects() {
-        return 0;
-    }
-
-    @Override
-    public void setShouldRedirect(IShouldRedirect shouldRedirect) {
-
-    }
-
-    @Override
-    public IShouldRedirect getShouldRedirect() {
-        return null;
-    }
-
-    @Override
-    public void setShouldRetry(IShouldRetry shouldretry) {
-
-    }
-
-    @Override
-    public IShouldRetry getShouldRetry() {
-        return null;
-    }
-
-    @Override
-    public void setMaxRetries(int maxRetries) {
-
-    }
-
-    @Override
-    public int getMaxRetries() {
-        return 0;
-    }
-
-    @Override
-    public void setDelay(long delay) {
-
-    }
-
-    @Override
-    public long getDelay() {
-        return 0;
-    }
-}

From 1c3feddfa6a5e5b6782f4a8d79de7ffcafce0568 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 20 Jan 2021 10:54:36 -0500
Subject: [PATCH 091/213] - reverts to public access modifiers because of
 android linting

---
 .../graph/authentication/AuthConstants.java     | 17 -----------------
 .../authentication/InternalAuthConstants.java   | 12 ++++++++++++
 .../TokenCredentialAuthProvider.java            |  4 ++--
 .../TokenCredentialAuthProviderTest.java        | 14 +++++++-------
 4 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/authentication/AuthConstants.java
 create mode 100644 src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java

diff --git a/src/main/java/com/microsoft/graph/authentication/AuthConstants.java b/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
deleted file mode 100644
index c2bae6797..000000000
--- a/src/main/java/com/microsoft/graph/authentication/AuthConstants.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.microsoft.graph.authentication;
-
-import com.google.common.annotations.VisibleForTesting;
-
-/**
- * Internal only.
- * Constants in use for the authentication provider
- */
-@VisibleForTesting
-class AuthConstants {
-    /** The bearer value for the authorization request header, contains a space */
-    @VisibleForTesting
-    protected static final String BEARER = "Bearer ";
-    /** The authorization request header name */
-    @VisibleForTesting
-    protected static final String AUTHORIZATION_HEADER = "Authorization";
-}
diff --git a/src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java b/src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java
new file mode 100644
index 000000000..54c7fd159
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java
@@ -0,0 +1,12 @@
+package com.microsoft.graph.authentication;
+
+/**
+ * Internal only.
+ * Constants in use for the authentication provider
+ */
+public class InternalAuthConstants {
+    /** The bearer value for the authorization request header, contains a space */
+    public static final String BEARER = "Bearer ";
+    /** The authorization request header name */
+    public static final String AUTHORIZATION_HEADER = "Authorization";
+}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 8334b1774..5e4291f67 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -82,7 +82,7 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
     @Override
     public void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException {
         if(ShouldAuthenticateRequest(request.getRequestUrl().toString())) {
-            request.addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken());
+            request.addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken());
         }
     }
 
@@ -97,7 +97,7 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) throws Auth
     public Request authenticateRequest(@Nonnull final Request request) throws AuthenticationException {
         if(ShouldAuthenticateRequest(request.url().toString())) {
             return request.newBuilder()
-                    .addHeader(AuthConstants.AUTHORIZATION_HEADER, AuthConstants.BEARER + getAccessToken())
+                    .addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken())
                     .build();
         } else {
             return request;
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 091874dc7..6f8c5ebe3 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -36,13 +36,13 @@ public void TokenCredentialAuthProviderTestICoreAuthentication() throws Authenti
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         // Act
-        Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertNull(request.header(InternalAuthConstants.AUTHORIZATION_HEADER));
         final Request authenticatedRequest = authProvider.authenticateRequest(request);
 
         // Assert
         Assert.assertEquals(request.url(), authenticatedRequest.url());
-        Assert.assertNotNull(authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
-        assertEquals(AuthConstants.BEARER + testToken, authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertNotNull(authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+        assertEquals(InternalAuthConstants.BEARER + testToken, authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
     }
 
     @Test
@@ -71,8 +71,8 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
         Assert.assertFalse(request.getHeaders().isEmpty());
 
         //Assert
-        Assert.assertTrue(request.getHeaders().get(0).getName().equals(AuthConstants.AUTHORIZATION_HEADER));
-        Assert.assertTrue(request.getHeaders().get(0).getValue().equals(AuthConstants.BEARER + this.testToken));
+        Assert.assertTrue(request.getHeaders().get(0).getName().equals(InternalAuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertTrue(request.getHeaders().get(0).getValue().equals(InternalAuthConstants.BEARER + this.testToken));
     }
     @Test
     public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreAuthentication() throws AuthenticationException {
@@ -83,12 +83,12 @@ public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreA
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         //Act
-        Assert.assertNull(request.header(AuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertNull(request.header(InternalAuthConstants.AUTHORIZATION_HEADER));
         final Request authenticatedRequest = authProvider.authenticateRequest(request);
 
         //Assert
         Assert.assertEquals(request.url(), authenticatedRequest.url());
-        Assert.assertNull(authenticatedRequest.header(AuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertNull(authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
     }
 
     @Test

From abc2de4bbdb3cd6a70eb6e7623c39686c861ee57 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 20 Jan 2021 10:57:18 -0500
Subject: [PATCH 092/213] - fixes linting issue on null annotations

---
 src/main/java/com/microsoft/graph/core/BaseClient.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index b1b8b4c44..af8e7fe36 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -234,7 +234,10 @@ public Builder<httpClientType> authenticationProvider(@Nonnull final ICoreAuthen
 		 *			 if there was an exception creating the client
 		 */
 		@Nonnull
-		protected <ClientType extends BaseClient> ClientType buildClient(ClientType instance) throws ClientException {
+		protected <ClientType extends BaseClient> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
+            if(instance == null) {
+                throw new IllegalArgumentException("The instance cannot be null");
+            }
 			instance.setHttpProvider(this.getHttpProvider());
 			instance.setLogger(this.getLogger());
 			instance.setSerializer(this.getSerializer());

From b9dbb1861fee98c554813fdaff2da37e049e859d Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 20 Jan 2021 13:25:14 -0500
Subject: [PATCH 093/213] - adds missing defensive programming - reorders
 provider ctor params for a better DevX - adds constants with documentation -
 adds defaults when values are not provided - addresses other comments

---
 .../TokenCredentialAuthProvider.java          | 66 +++++++++++--------
 1 file changed, 38 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 5e4291f67..dd12ffd09 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -5,6 +5,8 @@
 import com.azure.core.credential.TokenRequestContext;
 import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.http.IHttpRequest;
+
+import okhttp3.HttpUrl;
 import okhttp3.Request;
 
 import java.net.MalformedURLException;
@@ -22,30 +24,23 @@
  */
 public class TokenCredentialAuthProvider implements IAuthenticationProvider<Request> {
 
-    //TokenCredential expected from user
-    private TokenCredential tokenCredential;
-    //Context options which can be optionally set by the user
-    private TokenRequestContext context;
-    // maximum delay to wait for token obtention
-    private Duration tokenBlockTimeout;
-
-
-    //TODO: Upon further review from Peter, this should include a Null check in the case that this is the first request
-    //There should be just one constructor as scopes should probably not be optional
+    /** TokenCredential expected from user */
+    private final TokenCredential tokenCredential;
+    /** Context options which can be optionally set by the user */
+    private final TokenRequestContext context;
+    /** maximum delay to wait for token obtention */
+    private final Duration tokenBlockTimeout;
+    /** Default scope to use when no scopes are provided */
+    private static final String DEFAULT_GRAPH_SCOPE = "https://graph.microsoft.com/.default";
+    /** Default timeout for token obtention, set to 10 minutes in case of interactive flows to give time to the end user */
+    private static final long DEFAULT_TOKEN_TIMEOUT = 10;
     /**
      * Creates an Authentication provider using a passed in TokenCredential
      *
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
-     * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
-    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
-        if(tokenCredential == null) {
-            throw new AuthenticationException(new IllegalArgumentException("tokenCredential parameter cannot be null."));
-        }
-
-        this.tokenCredential = tokenCredential;
-        this.context = new TokenRequestContext();
-        this.tokenBlockTimeout = Duration.ofMinutes(10);
+    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) {
+        this(tokenCredential, Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}));
     }
 
     /**
@@ -53,11 +48,9 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
      *
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider
-     * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
-    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
-        this(tokenCredential);
-        this.context.setScopes(scopes);
+    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential, @Nonnull final List<String> scopes) {
+        this(tokenCredential, scopes, Duration.ofMinutes(DEFAULT_TOKEN_TIMEOUT));
     }
 
     /**
@@ -66,11 +59,20 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider
      * @param tokenObtentionTimeout Maximum time to wait for token obtention. Default 10 minutes. Use lower value on application with stable connectivity and no user interactions.
-     * @throws AuthenticationException exception occurs if the TokenCredential parameter is null
      */
-    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout, @Nonnull final TokenCredential tokenCredential) throws AuthenticationException {
-        this(tokenCredential);
+    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential, @Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout) {
+        if(tokenCredential == null) {
+            throw new IllegalArgumentException("tokenCredential parameter cannot be null.");
+        }
+        if(tokenObtentionTimeout == null) {
+            throw new IllegalArgumentException("tokenObtentionTimout parameter cannot be null");
+        }
+        if(scopes == null || scopes.isEmpty()) {
+            throw new IllegalArgumentException("scopes parameter cannot be null or empty");
+        }
+        this.context = new TokenRequestContext();
         this.context.setScopes(scopes);
+        this.tokenCredential = tokenCredential;
         this.tokenBlockTimeout = tokenObtentionTimeout;
     }
 
@@ -81,7 +83,11 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
      */
     @Override
     public void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException {
-        if(ShouldAuthenticateRequest(request.getRequestUrl().toString())) {
+        if(request == null) {
+            throw new IllegalArgumentException("request parameter cannot be null.");
+        }
+        final URL requestUrl = request.getRequestUrl();
+        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.toString())) {
             request.addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken());
         }
     }
@@ -95,7 +101,11 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) throws Auth
     @Override
     @Nonnull
     public Request authenticateRequest(@Nonnull final Request request) throws AuthenticationException {
-        if(ShouldAuthenticateRequest(request.url().toString())) {
+        if(request == null) {
+            throw new IllegalArgumentException("request parameter cannot be null.");
+        }
+        final HttpUrl requestUrl = request.url();
+        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.toString())) {
             return request.newBuilder()
                     .addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken())
                     .build();

From 4b25631f3bdcc7bc08e5165c37e5c222a9551067 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 20 Jan 2021 13:29:38 -0500
Subject: [PATCH 094/213] - updates samples to match new constructors

---
 .../deviceCodeSample/src/main/java/deviceCodeFlowMain.java    | 2 +-
 .../src/main/java/interactiveBrowserMain.java                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 1f4cd8ae5..a9ef95521 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -31,7 +31,7 @@ public static void deviceCodeFlow() throws AuthenticationException {
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
                 .build();
 
-        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(SCOPES, deviceCodeCred);
+        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, SCOPES);
         final OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
 
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index 057045a54..0ebea103d 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -16,7 +16,7 @@ public class interactiveBrowserMain {
     private final static String CLIENT_ID = "199e4de3-dd3b-4a51-b78a-86b801246e20";
 
     //Set the scopes for your ms-graph request
-    private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All"); 
+    private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All");
 
     public static void main(String args[]) throws Exception {
         interactiveBrowser();
@@ -29,7 +29,7 @@ private static void interactiveBrowser() throws AuthenticationException{
                 .port(8765)
                 .build();
 
-        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(SCOPES, interactiveBrowserCredential);
+        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(interactiveBrowserCredential, SCOPES);
         final OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
 
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();

From 3fe685765bf24742414c4d0b84af58524198c8ee Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 13:40:20 -0500
Subject: [PATCH 095/213] - changes order of parameters again to avoid
 offending kotlin

---
 .../src/main/java/deviceCodeFlowMain.java                 | 2 +-
 .../src/main/java/interactiveBrowserMain.java             | 2 +-
 .../graph/authentication/TokenCredentialAuthProvider.java | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index a9ef95521..1f4cd8ae5 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -31,7 +31,7 @@ public static void deviceCodeFlow() throws AuthenticationException {
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
                 .build();
 
-        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(deviceCodeCred, SCOPES);
+        final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(SCOPES, deviceCodeCred);
         final OkHttpClient httpClient = HttpClients.createDefault(tokenCredAuthProvider);
 
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index 0ebea103d..ca3b279b0 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -29,7 +29,7 @@ private static void interactiveBrowser() throws AuthenticationException{
                 .port(8765)
                 .build();
 
-        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(interactiveBrowserCredential, SCOPES);
+        final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(SCOPES, interactiveBrowserCredential);
         final OkHttpClient httpClient = HttpClients.createDefault(tokenCredentialAuthProvider);
 
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index dd12ffd09..ea13e4aef 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -40,7 +40,7 @@ public class TokenCredentialAuthProvider implements IAuthenticationProvider<Requ
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      */
     public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) {
-        this(tokenCredential, Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}));
+        this(Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}), tokenCredential);
     }
 
     /**
@@ -49,8 +49,8 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider
      */
-    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential, @Nonnull final List<String> scopes) {
-        this(tokenCredential, scopes, Duration.ofMinutes(DEFAULT_TOKEN_TIMEOUT));
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) {
+        this(scopes, Duration.ofMinutes(DEFAULT_TOKEN_TIMEOUT), tokenCredential);
     }
 
     /**
@@ -60,7 +60,7 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
      * @param scopes Specified desired scopes of the Auth Provider
      * @param tokenObtentionTimeout Maximum time to wait for token obtention. Default 10 minutes. Use lower value on application with stable connectivity and no user interactions.
      */
-    public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential, @Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout) {
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout, @Nonnull final TokenCredential tokenCredential) {
         if(tokenCredential == null) {
             throw new IllegalArgumentException("tokenCredential parameter cannot be null.");
         }

From 6f39a8a912543b0adb97328be7be7e5c1dd9eead Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 20 Jan 2021 16:25:33 -0500
Subject: [PATCH 096/213] - adds an execute method for JSON batches to avoid
 customers juggling with clients

---
 .../graph/content/MSBatchRequestContent.java  | 34 +++++++
 .../graph/content/MSBatchResponseContent.java | 88 +++++++++++++------
 .../com/microsoft/graph/core/BaseClient.java  |  8 +-
 .../com/microsoft/graph/core/IBaseClient.java |  4 +-
 .../graph/serializer/DefaultSerializer.java   |  5 +-
 .../microsoft/graph/core/BaseClientTests.java | 42 +++++++--
 6 files changed, 140 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index d227cc894..a151c4c2f 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -5,6 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -17,6 +18,8 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonPrimitive;
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
 import com.google.gson.JsonParseException;
 
 import okhttp3.Headers;
@@ -125,6 +128,37 @@ public String getBatchRequestContent() {
         return content;
     }
 
+    /**
+     * Executes the batch requests and returns the response
+     * @param client client to use for the request
+     * @return the batch response
+     * @throws ClientException when the batch couldn't be executed because of client issues.
+     */
+    @Nonnull
+    public MSBatchResponseContent execute(@Nonnull final IBaseClient client) throws ClientException {
+        try {
+            return executeAsync(client).get();
+        } catch (Exception ex) {
+            throw new ClientException("Batch failed to execute", ex);
+        }
+    }
+    /**
+     * Executes the batch requests asynchronously and returns the response
+     * @param client client to use for the request
+     * @return a future with the batch response
+     */
+    @Nonnull
+    public CompletableFuture<MSBatchResponseContent> executeAsync(@Nonnull final IBaseClient client) {
+        if(client == null) {
+            throw new IllegalArgumentException("client parameter cannot be null");
+        }
+        final String content = getBatchRequestContent();
+        return client.customRequest(client.getServiceRoot() + "/$batch", String.class)
+            .buildRequest()
+            .postAsync(content)
+            .thenApply(resp -> new MSBatchResponseContent(client.getServiceRoot() + "/", content, resp));
+    }
+
     private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
     private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep batchRequestStep) {
         final JsonObject contentmap = new JsonObject();
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index 7ca6c6585..df441a372 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -15,6 +15,7 @@
 import com.google.gson.JsonParseException;
 
 import okhttp3.MediaType;
+import okhttp3.Protocol;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
@@ -26,8 +27,9 @@
  */
 public class MSBatchResponseContent {
 
-    private final Response batchResponse;
-    private LinkedHashMap<String, Request> batchRequestsHashMap;
+    private final Protocol protocol;
+    private final String message;
+    private LinkedHashMap<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
     private JsonArray batchResponseArray;
     private String nextLink;
 
@@ -35,8 +37,24 @@ public class MSBatchResponseContent {
      * @param batchResponse OkHttp batch response on execution of batch requests
      */
     public MSBatchResponseContent(@Nullable final Response batchResponse) {
-        this.batchResponse = batchResponse;
         update(batchResponse);
+        this.message = batchResponse.message();
+        this.protocol = batchResponse.protocol();
+    }
+    /**
+     * intantiates a new response
+     * internal only, used when the content executes the requests
+     * @param baseUrl the base service URL without a trailing slash
+     * @param batchRequestData the batch request payload data as a JSON string
+     * @param batchResponseData the batch response body as a JSON string
+     */
+    protected MSBatchResponseContent(@Nonnull final String baseUrl, @Nonnull final String batchRequestData, @Nonnull final String batchResponseData) {
+        this.protocol = Protocol.HTTP_1_1;
+        this.message = "OK";
+        final Map<String, Request> requestMap = createBatchRequestsHashMap(baseUrl, JsonParser.parseString(batchRequestData).getAsJsonObject());
+        if (requestMap != null)
+            batchRequestsHashMap.putAll(requestMap);
+        updateFromResponseBody(batchResponseData);
     }
 
     /**
@@ -66,14 +84,13 @@ public Response getResponseById(@Nonnull final String requestId) {
                     // Put corresponding request into the constructed response
                     builder.request(batchRequestsHashMap.get(requestId));
                     // copy protocol and message same as of batch response
-                    builder.protocol(batchResponse.protocol());
-                    builder.message(batchResponse.message());
+                    builder.protocol(protocol);
+                    builder.message(message);
 
                     // Put status code of the corresponding request in JsonArray
                     final JsonElement statusElement = jsonresponse.get("status");
                     if (statusElement != null && statusElement.isJsonPrimitive()) {
-                        final Long status = statusElement.getAsLong();
-                        builder.code(status.intValue());
+                        builder.code(statusElement.getAsInt());
                     }
 
                     // Put body from response array for corresponding id into constructing response
@@ -144,8 +161,6 @@ public void update(@Nonnull final Response batchResponse) {
             throw new IllegalArgumentException("Batch Response cannot be null");
 
         final Map<String, Request> requestMap = createBatchRequestsHashMap(batchResponse);
-        if (batchRequestsHashMap == null)
-            batchRequestsHashMap = new LinkedHashMap<>();
         if (requestMap != null)
             batchRequestsHashMap.putAll(requestMap);
 
@@ -153,28 +168,31 @@ public void update(@Nonnull final Response batchResponse) {
             try {
                 final String batchResponseData = batchResponse.body().string();
                 if (batchResponseData != null) {
-                    final JsonObject batchResponseObj = stringToJSONObject(batchResponseData);
-                    if (batchResponseObj != null) {
-
-                        final JsonElement nextLinkElement = batchResponseObj.get("@odata.nextLink");
-                        if (nextLinkElement != null && nextLinkElement.isJsonPrimitive())
-                            nextLink = nextLinkElement.getAsString();
-
-                        if (batchResponseArray == null)
-                            batchResponseArray = new JsonArray();
-
-                        final JsonElement responseArrayElement = batchResponseObj.get("responses");
-                        if (responseArrayElement != null && responseArrayElement.isJsonArray()) {
-                            final JsonArray responseArray = responseArrayElement.getAsJsonArray();
-                            batchResponseArray.addAll(responseArray);
-                        }
-                    }
+                    updateFromResponseBody(batchResponseData);
                 }
             } catch (final IOException e) {
                 e.printStackTrace();
             }
         }
     }
+    private void updateFromResponseBody(@Nonnull final String batchResponseData) {
+        final JsonObject batchResponseObj = stringToJSONObject(batchResponseData);
+        if (batchResponseObj != null) {
+
+            final JsonElement nextLinkElement = batchResponseObj.get("@odata.nextLink");
+            if (nextLinkElement != null && nextLinkElement.isJsonPrimitive())
+                nextLink = nextLinkElement.getAsString();
+
+            if (batchResponseArray == null)
+                batchResponseArray = new JsonArray();
+
+            final JsonElement responseArrayElement = batchResponseObj.get("responses");
+            if (responseArrayElement != null && responseArrayElement.isJsonArray()) {
+                final JsonArray responseArray = responseArrayElement.getAsJsonArray();
+                batchResponseArray.addAll(responseArray);
+            }
+        }
+    }
 
     /**
      * @return nextLink of batch response
@@ -188,8 +206,21 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
         if (batchResponse == null)
             return null;
         try {
-            final Map<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
             final JsonObject requestJSONObject = requestBodyToJSONObject(batchResponse.request());
+            final String baseUrl = batchResponse.request().url().toString().replace("$batch", "");
+            return createBatchRequestsHashMap(baseUrl, requestJSONObject);
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+    @Nullable
+    protected Map<String, Request> createBatchRequestsHashMap(@Nonnull final String baseUrl, @Nonnull final JsonObject requestJSONObject) {
+        if(baseUrl == null || baseUrl == "" || requestJSONObject == null) {
+            return null;
+        }
+        try {
+            final Map<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
             final JsonElement requestArrayElement = requestJSONObject.get("requests");
             if (requestArrayElement != null && requestArrayElement.isJsonArray()) {
                 final JsonArray requestArray = requestArrayElement.getAsJsonArray();
@@ -202,8 +233,7 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
 
                     final JsonElement urlElement = requestObject.get("url");
                     if (urlElement != null && urlElement.isJsonPrimitive()) {
-                        final StringBuilder fullUrl = new StringBuilder(
-                                batchResponse.request().url().toString().replace("$batch", ""));
+                        final StringBuilder fullUrl = new StringBuilder(baseUrl);
                         fullUrl.append(urlElement.getAsString());
                         builder.url(fullUrl.toString());
                     }
@@ -240,7 +270,7 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
             }
             return batchRequestsHashMap;
 
-        } catch (IOException | JsonParseException e) {
+        } catch (JsonParseException e) {
             e.printStackTrace();
         }
         return null;
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 1cb247915..27185d18b 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -22,7 +22,7 @@
 
 package com.microsoft.graph.core;
 
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.httpcore.HttpClients;
@@ -94,9 +94,9 @@ public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Non
 	 * @return the instance of this builder
 	 */
 	@Nonnull
-	public CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url) {
-		return new CustomRequestBuilder<JsonObject>(getServiceRoot() + url, this, null,
-				JsonObject.class);
+	public CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url) {
+		return new CustomRequestBuilder<JsonElement>(getServiceRoot() + url, this, null,
+				JsonElement.class);
 	}
 
 	/**
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index 5fc483f42..9941f6417 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -25,7 +25,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
@@ -91,7 +91,7 @@ public interface IBaseClient {
      * @param url the url to send the request to
      */
     @Nonnull
-    CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url);
+    CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url);
 
     /**
      * Gets the service SDK version if the service SDK is in use, null otherwise
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index eeef48fb1..616d03d35 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -206,7 +206,10 @@ else if (fieldObject instanceof IJsonBackedObject) {
 	@Override
 	@Nullable
 	public <T> String serializeObject(@Nonnull final T serializableObject) {
-		logger.logDebug("Serializing type " + serializableObject.getClass().getSimpleName());
+        logger.logDebug("Serializing type " + serializableObject.getClass().getSimpleName());
+        if(serializableObject instanceof String) { // we don't want to over serialize if we already have a serialized string
+            return (String)serializableObject;
+        }
 		JsonElement outJsonTree = gson.toJsonTree(serializableObject);
 
 		if (serializableObject instanceof IJsonBackedObject) {
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index 4b9da6dcb..b194a123b 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -1,6 +1,13 @@
 package com.microsoft.graph.core;
 
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -10,11 +17,17 @@
 import org.junit.Test;
 
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okio.BufferedSink;
+import okio.Okio;
 
 import com.microsoft.graph.http.IHttpProvider;
-import com.google.gson.JsonObject;
+import com.google.gson.JsonElement;
 import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.http.CustomRequest;
+import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
 /**
@@ -74,9 +87,28 @@ public void testSerializer() {
     }
     @Test
     public void testCustomRequest() {
-        final CustomRequestBuilder<JsonObject> simpleRequest = baseClient.customRequest("");
-        assertNotNull(simpleRequest);
-        final CustomRequestBuilder<String> stringRequest = baseClient.customRequest("", String.class);
-        assertNotNull(stringRequest);
+        baseClient.setHttpProvider(new CoreHttpProvider(new DefaultSerializer(mLogger), mLogger, new OkHttpClient.Builder().build()));
+        final CustomRequestBuilder<JsonElement> simpleRequestBuilder = baseClient.customRequest("");
+        assertNotNull(simpleRequestBuilder);
+        final CustomRequestBuilder<String> stringRequestBuilder = baseClient.customRequest("", String.class);
+        assertNotNull(stringRequestBuilder);
+        final CustomRequest<String> abs = stringRequestBuilder.buildRequest();
+        abs.setHttpMethod(HttpMethod.POST);
+        final Request nat = abs.getHttpRequest("somestring");
+        assertEquals("somestring", getStringFromRequestBody(nat));
+        assertEquals("application", nat.body().contentType().type());
+        assertEquals("json", nat.body().contentType().subtype());
+    }
+    private String getStringFromRequestBody(Request request) {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            final BufferedSink buffer = Okio.buffer(Okio.sink(out));
+            request.body().writeTo(buffer);
+            ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+            return CoreHttpProvider.streamToString(in);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return "";
+        }
     }
 }

From 53c58ba722865d5849e10099dc972189c4403ba7 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 13:03:05 -0500
Subject: [PATCH 097/213] - reverts string serialization bypass to avoid
 unconsistent behavior

---
 .../java/com/microsoft/graph/serializer/DefaultSerializer.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 616d03d35..610d6d84e 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -207,9 +207,6 @@ else if (fieldObject instanceof IJsonBackedObject) {
 	@Nullable
 	public <T> String serializeObject(@Nonnull final T serializableObject) {
         logger.logDebug("Serializing type " + serializableObject.getClass().getSimpleName());
-        if(serializableObject instanceof String) { // we don't want to over serialize if we already have a serialized string
-            return (String)serializableObject;
-        }
 		JsonElement outJsonTree = gson.toJsonTree(serializableObject);
 
 		if (serializableObject instanceof IJsonBackedObject) {

From 73219aeb056fc7e625886fbe26ed63b8cbb25bbb Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 13:12:19 -0500
Subject: [PATCH 098/213] - adds defensive programming - switches to json
 objects to avoid too much string manipulations - fixes a bug where the
 service root would be appended twice - adds missing unit tests

---
 .../graph/content/MSBatchRequestContent.java  |  67 ++++----
 .../graph/content/MSBatchRequestStep.java     |  15 +-
 .../graph/content/MSBatchResponseContent.java |  10 +-
 .../content/MSBatchRequestContentTest.java    | 158 ++++++++++++++++--
 .../graph/content/MSBatchRequestStepTest.java |  30 +++-
 .../microsoft/graph/core/BaseClientTests.java |   2 +-
 6 files changed, 212 insertions(+), 70 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index a151c4c2f..d9d77f3d1 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -1,7 +1,7 @@
 package com.microsoft.graph.content;
 
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,20 +43,14 @@ public class MSBatchRequestContent {
      *
      * @param batchRequestStepsArray List of batch steps for batching
      */
-    public MSBatchRequestContent(@Nonnull final List<MSBatchRequestStep> batchRequestStepsArray) {
-        if (batchRequestStepsArray.size() > MAX_NUMBER_OF_REQUESTS)
+    public MSBatchRequestContent(@Nonnull final MSBatchRequestStep... batchRequestStepsArray) {
+        if (batchRequestStepsArray.length > MAX_NUMBER_OF_REQUESTS)
             throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
 
         this.batchRequestStepsHashMap = new LinkedHashMap<>();
         for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
-            addBatchRequestStep(requestStep);
-    }
-
-    /**
-     * Creates empty batch request content
-     */
-    public MSBatchRequestContent() {
-        this.batchRequestStepsHashMap = new LinkedHashMap<>();
+            if(requestStep != null)
+                addBatchRequestStep(requestStep);
     }
 
     /**
@@ -66,6 +60,8 @@ public MSBatchRequestContent() {
      * given
      */
     public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchRequestStep) {
+        if(batchRequestStep == null)
+            throw new IllegalArgumentException("batchRequestStep parameter cannot be null");
         if (batchRequestStepsHashMap.containsKey(batchRequestStep.getRequestId()) ||
             batchRequestStepsHashMap.size() >= MAX_NUMBER_OF_REQUESTS)
             return false;
@@ -81,11 +77,13 @@ public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchReques
      */
     @Nonnull
     public String addBatchRequestStep(@Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
+        if(request == null)
+            throw new IllegalArgumentException("request parameter cannot be null");
         String requestId;
         do {
             requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
         } while(batchRequestStepsHashMap.keySet().contains(requestId));
-        if(addBatchRequestStep(new MSBatchRequestStep(requestId, request, Arrays.asList(arrayOfDependsOnIds))))
+        if(addBatchRequestStep(new MSBatchRequestStep(requestId, request, arrayOfDependsOnIds)))
             return requestId;
         else
             throw new IllegalArgumentException("unable to add step to batch. Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
@@ -103,8 +101,8 @@ public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
             batchRequestStepsHashMap.remove(requestId);
             removed = true;
             for (final Map.Entry<String, MSBatchRequestStep> steps : batchRequestStepsHashMap.entrySet()) {
-                if (steps.getValue() != null && steps.getValue().getArrayOfDependsOnIds() != null) {
-                    while (steps.getValue().getArrayOfDependsOnIds().remove(requestId))
+                if (steps.getValue() != null && steps.getValue().getDependsOnIds() != null) {
+                    while (steps.getValue().getDependsOnIds().remove(requestId))
                         ;
                 }
             }
@@ -112,20 +110,21 @@ public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
         return removed;
     }
 
-    /**
-     * @return Batch request content's json as String
-     */
-    @Nonnull
-    public String getBatchRequestContent() {
+    private JsonObject getBatchRequestContentAsJson() {
         final JsonObject batchRequestContentMap = new JsonObject();
         final JsonArray batchContentArray = new JsonArray();
         for (final Map.Entry<String, MSBatchRequestStep> requestStep : batchRequestStepsHashMap.entrySet()) {
             batchContentArray.add(getBatchRequestObjectFromRequestStep(requestStep.getValue()));
         }
         batchRequestContentMap.add("requests", batchContentArray);
-
-        final String content = batchRequestContentMap.toString();
-        return content;
+        return batchRequestContentMap;
+    }
+    /**
+     * @return Batch request content's json as String
+     */
+    @Nonnull
+    public String getBatchRequestContent() {
+        return getBatchRequestContentAsJson().toString();
     }
 
     /**
@@ -135,12 +134,14 @@ public String getBatchRequestContent() {
      * @throws ClientException when the batch couldn't be executed because of client issues.
      */
     @Nonnull
-    public MSBatchResponseContent execute(@Nonnull final IBaseClient client) throws ClientException {
-        try {
-            return executeAsync(client).get();
-        } catch (Exception ex) {
-            throw new ClientException("Batch failed to execute", ex);
-        }
+    public MSBatchResponseContent execute(@Nonnull final IBaseClient client) {
+        final JsonObject content = getBatchRequestContentAsJson();
+        return new MSBatchResponseContent(client.getServiceRoot() + "/",
+                                        content,
+                                        client.customRequest("/$batch")
+                                                .buildRequest()
+                                                .post(content)
+                                                .getAsJsonObject());
     }
     /**
      * Executes the batch requests asynchronously and returns the response
@@ -152,11 +153,11 @@ public CompletableFuture<MSBatchResponseContent> executeAsync(@Nonnull final IBa
         if(client == null) {
             throw new IllegalArgumentException("client parameter cannot be null");
         }
-        final String content = getBatchRequestContent();
-        return client.customRequest(client.getServiceRoot() + "/$batch", String.class)
+        final JsonObject content = getBatchRequestContentAsJson();
+        return client.customRequest("/$batch")
             .buildRequest()
             .postAsync(content)
-            .thenApply(resp -> new MSBatchResponseContent(client.getServiceRoot() + "/", content, resp));
+            .thenApply(resp -> new MSBatchResponseContent(client.getServiceRoot() + "/", content, resp.getAsJsonObject()));
     }
 
     private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
@@ -180,9 +181,9 @@ private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep
             contentmap.add("headers", headerMap);
         }
 
-        final List<String> arrayOfDependsOnIds = batchRequestStep.getArrayOfDependsOnIds();
+        final HashSet<String> arrayOfDependsOnIds = batchRequestStep.getDependsOnIds();
         if (arrayOfDependsOnIds != null) {
-            final JsonArray array = new JsonArray();
+            final JsonArray array = new JsonArray(arrayOfDependsOnIds.size());
             for (final String dependsOnId : arrayOfDependsOnIds)
                 array.add(dependsOnId);
             contentmap.add("dependsOn", array);
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
index 808bee280..c023cc0ad 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
@@ -1,6 +1,7 @@
 package com.microsoft.graph.content;
 
-import java.util.List;
+import java.util.Arrays;
+import java.util.HashSet;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -13,7 +14,7 @@
 public class MSBatchRequestStep {
     private String requestId;
     private Request request;
-    private List<String> arrayOfDependsOnIds;
+    private HashSet<String> dependsOnIds;
 
     /**
      * Initializes a batch step from a raw HTTP request
@@ -21,17 +22,17 @@ public class MSBatchRequestStep {
      * @param request the request to send in the batch
      * @param arrayOfDependsOnIds the ids of steps this step depends on
      */
-    public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final List<String> arrayOfDependsOnIds) {
+    public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
         if(requestId == null)
             throw new IllegalArgumentException("Request Id cannot be null.");
         if(requestId.length() == 0)
             throw new IllegalArgumentException("Request Id cannot be empty.");
         if(request == null)
-            new IllegalArgumentException("Request cannot be null.");
+            throw new IllegalArgumentException("Request cannot be null.");
 
         this.requestId = requestId;
         this.request = request;
-        this.arrayOfDependsOnIds = arrayOfDependsOnIds;
+        this.dependsOnIds = new HashSet<>(Arrays.asList(arrayOfDependsOnIds));
     }
 
     /**
@@ -57,7 +58,7 @@ public Request getRequest() {
      * @return the list of steps this step depends on
      */
     @Nullable
-    public List<String> getArrayOfDependsOnIds(){
-        return arrayOfDependsOnIds;
+    public HashSet<String> getDependsOnIds(){
+        return dependsOnIds;
     }
 }
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index df441a372..b9a47f246 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -48,10 +48,10 @@ public MSBatchResponseContent(@Nullable final Response batchResponse) {
      * @param batchRequestData the batch request payload data as a JSON string
      * @param batchResponseData the batch response body as a JSON string
      */
-    protected MSBatchResponseContent(@Nonnull final String baseUrl, @Nonnull final String batchRequestData, @Nonnull final String batchResponseData) {
+    protected MSBatchResponseContent(@Nonnull final String baseUrl, @Nonnull final JsonObject batchRequestData, @Nonnull final JsonObject batchResponseData) {
         this.protocol = Protocol.HTTP_1_1;
         this.message = "OK";
-        final Map<String, Request> requestMap = createBatchRequestsHashMap(baseUrl, JsonParser.parseString(batchRequestData).getAsJsonObject());
+        final Map<String, Request> requestMap = createBatchRequestsHashMap(baseUrl, batchRequestData);
         if (requestMap != null)
             batchRequestsHashMap.putAll(requestMap);
         updateFromResponseBody(batchResponseData);
@@ -168,17 +168,15 @@ public void update(@Nonnull final Response batchResponse) {
             try {
                 final String batchResponseData = batchResponse.body().string();
                 if (batchResponseData != null) {
-                    updateFromResponseBody(batchResponseData);
+                    updateFromResponseBody(stringToJSONObject(batchResponseData));
                 }
             } catch (final IOException e) {
                 e.printStackTrace();
             }
         }
     }
-    private void updateFromResponseBody(@Nonnull final String batchResponseData) {
-        final JsonObject batchResponseObj = stringToJSONObject(batchResponseData);
+    private void updateFromResponseBody(@Nonnull final JsonObject batchResponseObj) {
         if (batchResponseObj != null) {
-
             final JsonElement nextLinkElement = batchResponseObj.get("@odata.nextLink");
             if (nextLinkElement != null && nextLinkElement.isJsonPrimitive())
                 nextLink = nextLinkElement.getAsString();
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
index 3c1a0c777..4f27b839e 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
@@ -1,13 +1,40 @@
 package com.microsoft.graph.content;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+import com.google.gson.JsonParser;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
+import com.microsoft.graph.core.BaseClient;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.DefaultSerializer;
 
 import org.junit.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
 import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 public class MSBatchRequestContentTest {
 
@@ -15,22 +42,19 @@ public class MSBatchRequestContentTest {
 
     @Test
     public void testMSBatchRequestContentCreation() {
-        List<MSBatchRequestStep> requestStepArray = new ArrayList<>();
-        for(int i=0;i<5;i++) {
+        MSBatchRequestContent requestContent = new MSBatchRequestContent();
+        for (int i = 0; i < 5; i++) {
             Request request = new Request.Builder().url(testurl).build();
-            List<String> arrayOfDependsOnIds = new ArrayList<>();
-            MSBatchRequestStep requestStep = new MSBatchRequestStep("" + i, request, arrayOfDependsOnIds);
-            requestStepArray.add(requestStep);
+            MSBatchRequestStep requestStep = new MSBatchRequestStep("" + i, request);
+            requestContent.addBatchRequestStep(requestStep);
         }
-        MSBatchRequestContent requestContent = new MSBatchRequestContent(requestStepArray);
         assertTrue(requestContent.getBatchRequestContent() != null);
     }
 
     @Test
     public void testGetBatchRequestContent() {
         Request request = new Request.Builder().url(testurl).build();
-        List<String> arrayOfDependsOnIds = new ArrayList<>();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
         MSBatchRequestContent requestContent = new MSBatchRequestContent();
         requestContent.addBatchRequestStep(requestStep);
         String content = requestContent.getBatchRequestContent();
@@ -41,8 +65,7 @@ public void testGetBatchRequestContent() {
     @Test
     public void testGetBatchRequestContentWithHeader() {
         Request request = new Request.Builder().url(testurl).header("testkey", "testvalue").build();
-        List<String> arrayOfDependsOnIds = new ArrayList<>();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
         MSBatchRequestContent requestContent = new MSBatchRequestContent();
         requestContent.addBatchRequestStep(requestStep);
         String content = requestContent.getBatchRequestContent();
@@ -54,8 +77,7 @@ public void testGetBatchRequestContentWithHeader() {
     @Test
     public void testRemoveBatchRequesStepWithId() {
         Request request = new Request.Builder().url(testurl).build();
-        List<String> arrayOfDependsOnIds = new ArrayList<>();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
         MSBatchRequestContent requestContent = new MSBatchRequestContent();
         requestContent.addBatchRequestStep(requestStep);
         requestContent.removeBatchRequestStepWithId("1");
@@ -67,13 +89,10 @@ public void testRemoveBatchRequesStepWithId() {
     @Test
     public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() {
         Request request = new Request.Builder().url(testurl).build();
-        List<String> arrayOfDependsOnIds = new ArrayList<>();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
 
         Request request1 = new Request.Builder().url(testurl).build();
-        List<String> arrayOfDependsOnIds1 = new ArrayList<>();
-        arrayOfDependsOnIds1.add("1");
-        MSBatchRequestStep requestStep1 = new MSBatchRequestStep("2", request1, arrayOfDependsOnIds1);
+        MSBatchRequestStep requestStep1 = new MSBatchRequestStep("2", request1, "1");
 
         MSBatchRequestContent requestContent = new MSBatchRequestContent();
         requestContent.addBatchRequestStep(requestStep);
@@ -85,4 +104,109 @@ public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() {
         assertTrue(content.compareTo(expectedContent) == 0);
     }
 
+    @Test
+    public void defensiveProgrammingTests() {
+        final MSBatchRequestStep mockStep = mock(MSBatchRequestStep.class);
+        final HashSet<String> reservedIds = new HashSet<>();
+        when(mockStep.getRequestId()).thenAnswer(new Answer<String>() {
+            @Override
+            public String answer(InvocationOnMock invocation) throws Throwable {
+                return getNewId(reservedIds);
+            }
+        });
+
+        try {
+            new MSBatchRequestContent(null, null, null, null, null, null, null, null, null, null, null, null, null,
+                    null, null, null, null, null, null, null, null, null);
+            fail("the number of steps cannot exceed 20");
+        } catch (IllegalArgumentException ex) {
+        }
+
+        new MSBatchRequestContent(mockStep, null); // addind a null step doesn't throw
+        try {
+            new MSBatchRequestContent().addBatchRequestStep(null);
+            fail("should throw argument exception");
+        } catch (IllegalArgumentException ex) {
+        }
+        try {
+            new MSBatchRequestContent().addBatchRequestStep((Request) null);
+            fail("should throw argument exception");
+        } catch (IllegalArgumentException ex) {
+        }
+
+        try {
+            final MSBatchRequestContent batchContent = new MSBatchRequestContent();
+            for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
+                assertNotNull(batchContent.addBatchRequestStep(mock(Request.class)));
+            }
+            batchContent.addBatchRequestStep(mock(Request.class));
+            fail("the number of steps cannot exceed 20");
+        } catch (IllegalArgumentException ex) {
+        }
+        {
+            final MSBatchRequestContent batchContent = new MSBatchRequestContent();
+            reservedIds.clear();
+            for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
+                assertTrue("item number " + i + " should be added successfully",
+                        batchContent.addBatchRequestStep(mockStep));
+            }
+            assertFalse(batchContent.addBatchRequestStep(mockStep));
+        }
+    }
+
+    private String getNewId(final HashSet<String> reserved) {
+        String requestId;
+        do {
+            requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
+        } while (reserved.contains(requestId));
+        reserved.add(requestId);
+        return requestId;
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void executeBatchTest() throws Throwable {
+        final MSBatchRequestStep step = new MSBatchRequestStep("1", new Request
+                                                                    .Builder()
+                                                                    .url(testurl)
+                                                                    .method("GET", null)
+                                                                    .build());
+        final MSBatchRequestContent content = new MSBatchRequestContent(step);
+        final OkHttpClient mHttpClient = mock(OkHttpClient.class);
+        final Call mCall = mock(Call.class);
+        when(mHttpClient.newCall(any(Request.class))).thenReturn(mCall);
+
+        final CoreHttpProvider mHttpProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)), mock(ILogger.class), mHttpClient);
+        final IBaseClient mClient = BaseClient.builder()
+                                            .authenticationProvider(mock(IAuthenticationProvider.class))
+                                            .httpProvider(mHttpProvider)
+                                            .buildClient();
+        final Response mResponse = new Response
+                                            .Builder()
+                                            .request(new Request
+                                                        .Builder()
+                                                        .url("https://graph.microsoft.com/v1.0/$batch")
+                                                        .build())
+                                            .code(200)
+                                            .protocol(Protocol.HTTP_1_1)
+                                            .message("OK")
+                                            .addHeader("Content-type", "application/json")
+                                            .body(ResponseBody.create("{\"responses\": [{\"id\": \"1\",\"status\": 200,\"body\": null}]}",
+                                                    MediaType.parse("application/json")))
+                                            .build();
+        when(mCall.execute()).thenReturn(mResponse);
+        final MSBatchResponseContent batchResponse = content.execute(mClient);
+        final Response response = batchResponse.getResponseById("1");
+        assertNotNull(response);
+    }
+    @Test
+    public void responseParsing() {
+        final MSBatchResponseContent batchResponse = new MSBatchResponseContent("https://graph.microsoft.com/v1.0",
+                                                        JsonParser.parseString("{\"requests\":[{\"id\":\"1\",\"method\":\"GET\",\"url\":\"/me\"}]}")
+                                                                    .getAsJsonObject(),
+                                                        JsonParser.parseString("{\"responses\": [{\"id\": \"1\",\"status\": 200,\"body\": null}]}")
+                                                                    .getAsJsonObject());
+        final Response response = batchResponse.getResponseById("1");
+        assertNotNull(response);
+    }
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
index 3bf3ca660..794b59c2e 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
@@ -1,9 +1,8 @@
 package com.microsoft.graph.content;
 
 import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
 
@@ -14,12 +13,31 @@ public class MSBatchRequestStepTest {
     @Test
     public void testMSBatchRequestStepCreation() {
         Request request = new Request.Builder().url("http://graph.microsoft.com").build();
-        List<String> arrayOfDependsOnIds = new ArrayList<>();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request, arrayOfDependsOnIds);
+        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
         assertTrue("Test BatchRequestStep creation", requestStep != null);
         assertTrue("Test Request id", requestStep.getRequestId().compareTo("1") == 0);
         assertTrue("Test Request object", requestStep.getRequest() == request);
-        assertTrue("Test Array of depends on Ids", requestStep.getArrayOfDependsOnIds() != null);
+        assertTrue("Test Array of depends on Ids", requestStep.getDependsOnIds() != null);
+    }
+
+    @Test
+    public void defensiveProgrammingTests() {
+        try {
+            new MSBatchRequestStep(null, null);
+            fail("should throw argument exception");
+        } catch (IllegalArgumentException ex) {
+        }
+        try {
+            new MSBatchRequestStep("id", null);
+            fail("should throw argument exception");
+        } catch (IllegalArgumentException ex) {
+        }
+        try {
+            new MSBatchRequestStep("", null);
+            fail("should throw argument exception");
+        } catch (IllegalArgumentException ex) {
+        }
+        new MSBatchRequestStep("id", mock(Request.class));
     }
 
 }
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index b194a123b..3567608c4 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -95,7 +95,7 @@ public void testCustomRequest() {
         final CustomRequest<String> abs = stringRequestBuilder.buildRequest();
         abs.setHttpMethod(HttpMethod.POST);
         final Request nat = abs.getHttpRequest("somestring");
-        assertEquals("somestring", getStringFromRequestBody(nat));
+        assertEquals("\"somestring\"", getStringFromRequestBody(nat));
         assertEquals("application", nat.body().contentType().type());
         assertEquals("json", nat.body().contentType().subtype());
     }

From 2ef30c4fe398e9ca83ff7c90daac4ae67a96003f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 14:04:06 -0500
Subject: [PATCH 099/213] - removes usage of deprecated API in sample

---
 .../src/main/java/interactiveBrowserMain.java                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index ca3b279b0..42e5c237c 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -26,7 +26,7 @@ private static void interactiveBrowser() throws AuthenticationException{
 
         final InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
                 .clientId(CLIENT_ID)
-                .port(8765)
+                .redirectUrl("http://localhost:8765")
                 .build();
 
         final TokenCredentialAuthProvider tokenCredentialAuthProvider = new TokenCredentialAuthProvider(SCOPES, interactiveBrowserCredential);

From 974305df1cd41054e4f7508637b0ec33aec858f9 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 15:14:07 -0500
Subject: [PATCH 100/213] - fixes a bug where ints would be compared by
 reference instead of value generating extra logs

---
 .../com/microsoft/graph/serializer/DefaultSerializer.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index eeef48fb1..1b701cc00 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -161,8 +161,8 @@ else if (fieldObject instanceof List) {
 							final List<?> fieldObjectList = (List<?>) fieldObject;
 							if (collectionJson != null && collectionJson.isJsonArray()) {
 								final JsonArray rawJsonArray = (JsonArray) collectionJson;
-								final Integer fieldObjectListSize = fieldObjectList.size();
-								final Integer rawJsonArraySize = rawJsonArray.size();
+								final int fieldObjectListSize = fieldObjectList.size();
+								final int rawJsonArraySize = rawJsonArray.size();
 								for (int i = 0; i < fieldObjectListSize && i < rawJsonArraySize; i++) {
 									final Object element = fieldObjectList.get(i);
 									if (element instanceof IJsonBackedObject) {

From f227c498bd98dab6bf4f8580f5d50bf25ff33e94 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 15:26:46 -0500
Subject: [PATCH 101/213] - replaces try catches in batch unit tests by assert
 throws for readbility

---
 .../content/MSBatchRequestContentTest.java    | 31 ++++++-------------
 .../graph/content/MSBatchRequestStepTest.java | 20 +++++-------
 .../content/MSBatchResponseContentTest.java   | 18 ++++-------
 3 files changed, 22 insertions(+), 47 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
index 4f27b839e..a14195156 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
@@ -2,17 +2,13 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 import com.google.gson.JsonParser;
@@ -28,7 +24,6 @@
 import org.mockito.stubbing.Answer;
 
 import okhttp3.Call;
-import okhttp3.Callback;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
@@ -115,34 +110,26 @@ public String answer(InvocationOnMock invocation) throws Throwable {
             }
         });
 
-        try {
+        assertThrows("the number of steps cannot exceed 20", IllegalArgumentException.class, () -> {
             new MSBatchRequestContent(null, null, null, null, null, null, null, null, null, null, null, null, null,
                     null, null, null, null, null, null, null, null, null);
-            fail("the number of steps cannot exceed 20");
-        } catch (IllegalArgumentException ex) {
-        }
+        });
 
         new MSBatchRequestContent(mockStep, null); // addind a null step doesn't throw
-        try {
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
             new MSBatchRequestContent().addBatchRequestStep(null);
-            fail("should throw argument exception");
-        } catch (IllegalArgumentException ex) {
-        }
-        try {
+        });
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
             new MSBatchRequestContent().addBatchRequestStep((Request) null);
-            fail("should throw argument exception");
-        } catch (IllegalArgumentException ex) {
-        }
+        });
 
-        try {
+        assertThrows("the number of steps cannot exceed 20", IllegalArgumentException.class, () -> {
             final MSBatchRequestContent batchContent = new MSBatchRequestContent();
             for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
                 assertNotNull(batchContent.addBatchRequestStep(mock(Request.class)));
             }
             batchContent.addBatchRequestStep(mock(Request.class));
-            fail("the number of steps cannot exceed 20");
-        } catch (IllegalArgumentException ex) {
-        }
+        });
         {
             final MSBatchRequestContent batchContent = new MSBatchRequestContent();
             reservedIds.clear();
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
index 794b59c2e..37f55024b 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
@@ -1,7 +1,7 @@
 package com.microsoft.graph.content;
 
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
@@ -22,21 +22,15 @@ public void testMSBatchRequestStepCreation() {
 
     @Test
     public void defensiveProgrammingTests() {
-        try {
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
             new MSBatchRequestStep(null, null);
-            fail("should throw argument exception");
-        } catch (IllegalArgumentException ex) {
-        }
-        try {
+        });
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
             new MSBatchRequestStep("id", null);
-            fail("should throw argument exception");
-        } catch (IllegalArgumentException ex) {
-        }
-        try {
+        });
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
             new MSBatchRequestStep("", null);
-            fail("should throw argument exception");
-        } catch (IllegalArgumentException ex) {
-        }
+        });
         new MSBatchRequestStep("id", mock(Request.class));
     }
 
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
index 14427d814..5e28699d1 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
@@ -1,6 +1,6 @@
 package com.microsoft.graph.content;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
@@ -20,13 +20,9 @@ public class MSBatchResponseContentTest {
 
     @Test
     public void testNullMSBatchResponseContent() {
-        Response response = null;
-        try {
-            new MSBatchResponseContent(response);
-        }
-        catch(IllegalArgumentException e) {
-            assertNotNull(e);
-        }
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+            new MSBatchResponseContent((Response)null);
+        });
     }
 
     @Test
@@ -49,11 +45,9 @@ public void testInvalidMSBatchResponseContentWithEmptyResponse() {
 
     @Test
     public void testInvalidMSBatchResponseContentWithNullResponseString() {
-        try{
+        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
             new MSBatchResponseContent(null);
-        }catch(Exception e) {
-            assertTrue(e instanceof IllegalArgumentException);
-        }
+        });
     }
 
     @Test

From 91e29451ddb0db7569253dded86021489e0eafb4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 15:34:11 -0500
Subject: [PATCH 102/213] - replaces calls to obsolete APIs - makes internal
 method private

---
 .../microsoft/graph/content/MSBatchResponseContent.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index b9a47f246..d3f7825ae 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -99,7 +99,7 @@ public Response getResponseById(@Nonnull final String requestId) {
                         final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
                         final String bodyAsString = JsonObject.toString();
                         final ResponseBody responseBody = ResponseBody
-                                .create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
+                                .create(bodyAsString, MediaType.parse("application/json; charset=utf-8"));
                         builder.body(responseBody);
                     }
 
@@ -212,8 +212,7 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
             return null;
         }
     }
-    @Nullable
-    protected Map<String, Request> createBatchRequestsHashMap(@Nonnull final String baseUrl, @Nonnull final JsonObject requestJSONObject) {
+    private Map<String, Request> createBatchRequestsHashMap(@Nonnull final String baseUrl, @Nonnull final JsonObject requestJSONObject) {
         if(baseUrl == null || baseUrl == "" || requestJSONObject == null) {
             return null;
         }
@@ -255,7 +254,7 @@ protected Map<String, Request> createBatchRequestsHashMap(@Nonnull final String
                         final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
                         final String bodyAsString = JsonObject.toString();
                         final RequestBody requestBody = RequestBody
-                                .create(MediaType.parse("application/json; charset=utf-8"), bodyAsString);
+                                .create(bodyAsString, MediaType.parse("application/json; charset=utf-8"));
                         builder.method(jsonMethodElement.getAsString(), requestBody);
                     } else if (jsonMethodElement != null) {
                         builder.method(jsonMethodElement.getAsString(), null);

From 21944ebb4c7eaab01a22a40b50d18459d2fd5d13 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 16:20:58 -0500
Subject: [PATCH 103/213] - enables and fixes last disabled tests for
 CoreHttpProvider

---
 .../graph/http/CoreHttpProviderTests.java     | 53 +++++++++++++------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
index 710e8b924..f829e2936 100644
--- a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
+++ b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
@@ -6,24 +6,30 @@
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.anyObject;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.junit.Ignore;
 import org.junit.Test;
 
+import okhttp3.Call;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
@@ -31,9 +37,9 @@
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.logger.LoggerLevel;
 import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
-@Ignore
 public class CoreHttpProviderTests {
 
     private CoreHttpProvider mProvider;
@@ -51,7 +57,10 @@ public void testErrorResponse() throws Exception {
 
         setCoreHttpProvider(toSerialize);
         try {
-            mProvider.send(mock(IHttpRequest.class), Object.class, null);
+            final IHttpRequest mRequest = mock(IHttpRequest.class);
+            when(mRequest.getRequestUrl()).thenReturn(new URL("https://graph.microsoft.com/v1.0/me"));
+            when(mRequest.getHttpMethod()).thenReturn(HttpMethod.GET);
+            mProvider.send(mRequest, Object.class, null);
             fail("Expected exception in previous statement");
         } catch (final GraphServiceException e) {
         	assertTrue(e.getMessage().indexOf("truncated") > 0);
@@ -73,20 +82,23 @@ public void testVerboseErrorResponse() throws Exception {
         toSerialize.rawObject = raw;
 
         final ILogger logger = mock(ILogger.class);
-        logger.setLoggingLevel(LoggerLevel.DEBUG);
+        when(logger.getLoggingLevel()).thenReturn(LoggerLevel.DEBUG);
         final ISerializer serializer = mock(ISerializer.class);
-        when(serializer.deserializeObject(anyObject(), anyObject())).thenReturn(toSerialize);
+        when(serializer.deserializeObject(anyString(), any())).thenReturn(toSerialize);
 
         mProvider = new CoreHttpProvider(serializer,
                 logger,
                 new OkHttpClient.Builder().build());
 
         try {
-            mProvider.send(mock(IHttpRequest.class), Object.class, null);
+            final IHttpRequest mRequest = mock(IHttpRequest.class);
+            when(mRequest.getRequestUrl()).thenReturn(new URL("https://graph.microsoft.com/v1.0/me"));
+            when(mRequest.getHttpMethod()).thenReturn(HttpMethod.GET);
+            mProvider.send(mRequest, Object.class, null);
             fail("Expected exception in previous statement");
         } catch (final GraphServiceException e) {
         	assertFalse(e.getMessage().indexOf("truncated") > 0);
-        	assertTrue(e.getMessage().indexOf("The raw request was invalid") > 0);
+        	assertTrue(e.getMessage().indexOf("The raw request was invalid") < 0);
         }
     }
 
@@ -133,12 +145,23 @@ public void testStreamToStringReturnsEmpty() {
      * Configures the http provider for test cases
      * @param toSerialize The object to serialize
      */
-    private void setCoreHttpProvider(final Object toSerialize) {
-        final ISerializer serializer = mock(ISerializer.class);
-        when(serializer.deserializeObject(anyObject(), anyObject())).thenReturn(toSerialize);
-        mProvider = new CoreHttpProvider(serializer,
+    private void setCoreHttpProvider(final Object toSerialize) throws IOException {
+        final OkHttpClient mClient = mock(OkHttpClient.class);
+        final Call mCall = mock(Call.class);
+        when(mClient.newCall(any(Request.class))).thenReturn(mCall);
+        when(mCall.execute()).thenReturn(new Response
+                                                .Builder()
+                                                .code(503)
+                                                .message("Service Unavailable")
+                                                .protocol(Protocol.HTTP_1_1)
+                                                .request(new Request.Builder().url("https://graph.microsoft.com/v1.0/me").build())
+                                                .addHeader("Content-type", "application/json")
+                                                .body(ResponseBody.create(new GsonBuilder().setPrettyPrinting().create().toJson(toSerialize),
+                                                                        MediaType.parse("application/json")))
+                                                .build());
+        mProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)),
                 mock(ILogger.class),
-                new OkHttpClient.Builder().build());
+                mClient);
     }
 
 }

From 16321e2e38bd87f7886a2322954f5fa997675eea Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 17:31:17 -0500
Subject: [PATCH 104/213] Update
 samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java

Co-authored-by: Mustafa Zengin <muzengin@microsoft.com>
---
 samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 1f4cd8ae5..494aede21 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -18,7 +18,7 @@ public class deviceCodeFlowMain {
     private final static String CLIENT_ID = "cfb5d84c-c88f-466c-81fb-0fe9fa8da052";
 
     //Set the scopes for your ms-graph request
-    private final static List<String> SCOPES = Arrays.asList("user.ReadBasic.All", "User.Read");
+    private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All", "User.Read");
 
     public static void main(String[] args) throws AuthenticationException {
         deviceCodeFlow();

From 2f501b9b31f0fb378487d2d90370a7306de44e20 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 21 Jan 2021 17:31:43 -0500
Subject: [PATCH 105/213] Update
 src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java

Co-authored-by: Mustafa Zengin <muzengin@microsoft.com>
---
 .../graph/authentication/TokenCredentialAuthProvider.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index ea13e4aef..fb3a81802 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -44,7 +44,7 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
     }
 
     /**
-     * Creates an Authentication provider using a TokenCredential and list of scopes
+     * Creates an Authentication provider using a TokenCredential and list of scopes with default timeout (10 minutes)
      *
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider

From 927ab2e0d290a2b21e0c4e1b605677dca2f4320f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 07:54:40 -0500
Subject: [PATCH 106/213] - typo

---
 .../com/microsoft/graph/content/MSBatchResponseContent.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index d3f7825ae..658a2aa55 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -42,7 +42,7 @@ public MSBatchResponseContent(@Nullable final Response batchResponse) {
         this.protocol = batchResponse.protocol();
     }
     /**
-     * intantiates a new response
+     * instantiates a new response
      * internal only, used when the content executes the requests
      * @param baseUrl the base service URL without a trailing slash
      * @param batchRequestData the batch request payload data as a JSON string

From d7d669a3d2f7c3c9fd0ce4031dc12d27ecfb334f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 08:27:10 -0500
Subject: [PATCH 107/213] Apply suggestions from code review

---
 .../deviceCodeSample/src/main/java/deviceCodeFlowMain.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 494aede21..71cd124d1 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -12,10 +12,10 @@
 
 public class deviceCodeFlowMain {
 
-    //Replace CLIENT_ID with your own client id from an adequately configured app
+    //Replace CLIENT_ID with your own client id from an app that is configured according to the requirements below
     //for requirements visit:
     //https://github.com/Azure/azure-sdk-for-java/wiki/Set-up-Your-Environment-for-Authentication#enable-applications-for-device-code-flow
-    private final static String CLIENT_ID = "cfb5d84c-c88f-466c-81fb-0fe9fa8da052";
+    private final static String CLIENT_ID = "<your client/app id>";
 
     //Set the scopes for your ms-graph request
     private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All", "User.Read");

From 9f921e13722e4547edeb0ca69336ca7a61de286b Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 08:38:59 -0500
Subject: [PATCH 108/213] Update readme.md

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index c76104afd..f2a7ab051 100644
--- a/readme.md
+++ b/readme.md
@@ -120,7 +120,7 @@ The Microsoft Graph SDK is open for contribution. To contribute to this project,
 
 ## 6. Supported Java versions
 
-The Microsoft Graph SDK for Java library is supported at runtime for Java 8+ and [Android API revision 26](http://source.android.com/source/build-numbers.html) and greater.
+The Microsoft Graph SDK for Java library is supported at runtime for Java 8 and [Android API revision 26](http://source.android.com/source/build-numbers.html) or greater.
 
 Android developers targeting lower android API levels can do so by [enabling desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring) in their project.
 

From cd41d3ba8a447cd80b054c32c93c9ddd5cd7ac29 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 08:40:24 -0500
Subject: [PATCH 109/213] - removes intermediate methods in samples

---
 .../deviceCodeSample/src/main/java/deviceCodeFlowMain.java   | 5 -----
 .../src/main/java/interactiveBrowserMain.java                | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 71cd124d1..cc11d9af2 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -21,11 +21,6 @@ public class deviceCodeFlowMain {
     private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All", "User.Read");
 
     public static void main(String[] args) throws AuthenticationException {
-        deviceCodeFlow();
-    }
-
-    public static void deviceCodeFlow() throws AuthenticationException {
-
         final DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
                 .clientId(CLIENT_ID)
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index 42e5c237c..2f813d37d 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -19,11 +19,6 @@ public class interactiveBrowserMain {
     private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All");
 
     public static void main(String args[]) throws Exception {
-        interactiveBrowser();
-    }
-
-    private static void interactiveBrowser() throws AuthenticationException{
-
         final InteractiveBrowserCredential interactiveBrowserCredential = new InteractiveBrowserCredentialBuilder()
                 .clientId(CLIENT_ID)
                 .redirectUrl("http://localhost:8765")

From add6834eeaeef56cd72f919cba69d0e5cd7cbe07 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 08:40:56 -0500
Subject: [PATCH 110/213] - replaces ID by placeholder

---
 .../src/main/java/interactiveBrowserMain.java                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index 2f813d37d..b9b57214f 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -13,7 +13,7 @@ public class interactiveBrowserMain {
     //Replace CLIENT_ID with your own client id from an adequately configured app
     //for requirements visit:
     //https://github.com/Azure/azure-sdk-for-java/wiki/Set-up-Your-Environment-for-Authentication#enable-applications-for-interactive-browser-oauth-2-flow
-    private final static String CLIENT_ID = "199e4de3-dd3b-4a51-b78a-86b801246e20";
+    private final static String CLIENT_ID = "<your client/app id>";
 
     //Set the scopes for your ms-graph request
     private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All");

From 12319bc76128181eb6c0634cb83023f5ade93c32 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 08:49:41 -0500
Subject: [PATCH 111/213] - adds a verification for the protocol to be over TLS
 before attaching the token

---
 .../TokenCredentialAuthProvider.java            |  2 ++
 .../TokenCredentialAuthProviderTest.java        | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index fb3a81802..8bab56b28 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -118,6 +118,8 @@ public Request authenticateRequest(@Nonnull final Request request) throws Authen
     private boolean ShouldAuthenticateRequest(@Nonnull final String requestUrl) {
         try {
             final URL url = new URL(requestUrl);
+            if(!url.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
+                return false;
             final String hostName = url.getHost().toLowerCase(Locale.getDefault());
             return validGraphHostNames.contains(hostName);
         } catch (MalformedURLException ex) {
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 6f8c5ebe3..7d724dbe1 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -105,6 +105,23 @@ public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestIAuthe
         Assert.assertTrue(request.getHeaders().isEmpty());
         authProvider.authenticateRequest(request);
 
+        //Assert
+        Assert.assertTrue(request.getHeaders().isEmpty());
+    }
+    @Test
+    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidProtocols() throws AuthenticationException,
+            MalformedURLException {
+
+        //Arrange
+        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+        final IHttpRequest request = mock(IHttpRequest.class);
+        when(request.getRequestUrl()).thenReturn(new URL("http://graph.microsoft.com"));
+        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+
+        //Act
+        Assert.assertTrue(request.getHeaders().isEmpty());
+        authProvider.authenticateRequest(request);
+
         //Assert
         Assert.assertTrue(request.getHeaders().isEmpty());
     }

From ab0cb98592af32749fd89a75a8c32a9bad656adf Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 09:01:47 -0500
Subject: [PATCH 112/213] - adds tests for national clouds

---
 .../TokenCredentialAuthProviderTest.java      | 83 ++++++++++---------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 7d724dbe1..03f9a0ca7 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -21,58 +21,65 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 
 public class TokenCredentialAuthProviderTest {
 
     public final String testToken = "CredentialTestToken";
+    private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
 
     @Test
     public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
 
-        // Arrange
-        final Request request = new Request.Builder().url("https://graph.microsoft.com").build();
-        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
-
-        // Act
-        Assert.assertNull(request.header(InternalAuthConstants.AUTHORIZATION_HEADER));
-        final Request authenticatedRequest = authProvider.authenticateRequest(request);
-
-        // Assert
-        Assert.assertEquals(request.url(), authenticatedRequest.url());
-        Assert.assertNotNull(authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
-        assertEquals(InternalAuthConstants.BEARER + testToken, authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+        for(final String hostName : validGraphHostNames) {
+            // Arrange
+            final Request request = new Request.Builder().url("https://" + hostName).build();
+            final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+            final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+
+            // Act
+            Assert.assertNull(request.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+            final Request authenticatedRequest = authProvider.authenticateRequest(request);
+
+            // Assert
+            Assert.assertEquals(request.url(), authenticatedRequest.url());
+            Assert.assertNotNull(authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+            assertEquals(InternalAuthConstants.BEARER + testToken, authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+        }
     }
 
     @Test
     public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException, MalformedURLException {
 
-        // Arrange
-        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        final IHttpRequest request = mock(IHttpRequest.class);
-        final List<HeaderOption> headersOptions = new ArrayList<>();
-        when(request.getRequestUrl()).thenReturn(new URL("https://graph.microsoft.com"));
-        doAnswer(new Answer<Void>() {
-
-            @Override
-            public Void answer(InvocationOnMock invocation) throws Throwable {
-                headersOptions.add(new HeaderOption((String)invocation.getArguments()[0], (String)invocation.getArguments()[1]));
-                return null;
-            }
-
-        }).when(request).addHeader(any(String.class), any(String.class));
-        when(request.getHeaders()).thenReturn(headersOptions);
-        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
-
-        //Act
-        Assert.assertTrue(request.getHeaders().isEmpty());
-        authProvider.authenticateRequest(request);
-        Assert.assertFalse(request.getHeaders().isEmpty());
-
-        //Assert
-        Assert.assertTrue(request.getHeaders().get(0).getName().equals(InternalAuthConstants.AUTHORIZATION_HEADER));
-        Assert.assertTrue(request.getHeaders().get(0).getValue().equals(InternalAuthConstants.BEARER + this.testToken));
+        for(final String hostName : validGraphHostNames) {
+            // Arrange
+            final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
+            final IHttpRequest request = mock(IHttpRequest.class);
+            final List<HeaderOption> headersOptions = new ArrayList<>();
+            when(request.getRequestUrl()).thenReturn(new URL("https://" + hostName));
+            doAnswer(new Answer<Void>() {
+
+                @Override
+                public Void answer(InvocationOnMock invocation) throws Throwable {
+                    headersOptions.add(new HeaderOption((String)invocation.getArguments()[0], (String)invocation.getArguments()[1]));
+                    return null;
+                }
+
+            }).when(request).addHeader(any(String.class), any(String.class));
+            when(request.getHeaders()).thenReturn(headersOptions);
+            final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
+
+            //Act
+            Assert.assertTrue(request.getHeaders().isEmpty());
+            authProvider.authenticateRequest(request);
+            Assert.assertFalse(request.getHeaders().isEmpty());
+
+            //Assert
+            Assert.assertTrue(request.getHeaders().get(0).getName().equals(InternalAuthConstants.AUTHORIZATION_HEADER));
+            Assert.assertTrue(request.getHeaders().get(0).getValue().equals(InternalAuthConstants.BEARER + this.testToken));
+        }
     }
     @Test
     public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreAuthentication() throws AuthenticationException {

From 2c29deb117870a124a15905acf0d707138a4d635 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 09:03:50 -0500
Subject: [PATCH 113/213] - moves to a URL prototype and adds defensive
 programming

---
 .../TokenCredentialAuthProvider.java           | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 8bab56b28..c92707f5f 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -9,7 +9,6 @@
 import okhttp3.HttpUrl;
 import okhttp3.Request;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
 import java.util.Arrays;
@@ -87,7 +86,7 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) throws Auth
             throw new IllegalArgumentException("request parameter cannot be null.");
         }
         final URL requestUrl = request.getRequestUrl();
-        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.toString())) {
+        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl)) {
             request.addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken());
         }
     }
@@ -105,7 +104,7 @@ public Request authenticateRequest(@Nonnull final Request request) throws Authen
             throw new IllegalArgumentException("request parameter cannot be null.");
         }
         final HttpUrl requestUrl = request.url();
-        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.toString())) {
+        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.url())) {
             return request.newBuilder()
                     .addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken())
                     .build();
@@ -115,16 +114,11 @@ public Request authenticateRequest(@Nonnull final Request request) throws Authen
     }
 
     private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
-    private boolean ShouldAuthenticateRequest(@Nonnull final String requestUrl) {
-        try {
-            final URL url = new URL(requestUrl);
-            if(!url.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
-                return false;
-            final String hostName = url.getHost().toLowerCase(Locale.getDefault());
-            return validGraphHostNames.contains(hostName);
-        } catch (MalformedURLException ex) {
+    private boolean ShouldAuthenticateRequest(@Nonnull final URL requestUrl) {
+        if(requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
             return false;
-        }
+        final String hostName = requestUrl.getHost().toLowerCase(Locale.getDefault());
+        return validGraphHostNames.contains(hostName);
     }
 
     /**

From 4a379b69089538a907c183e80731e908bf60cac5 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 09:22:09 -0500
Subject: [PATCH 114/213] - moves constants in it's usage class

---
 .../authentication/InternalAuthConstants.java      | 12 ------------
 .../TokenCredentialAuthProvider.java               |  8 ++++++--
 .../TokenCredentialAuthProviderTest.java           | 14 +++++++-------
 3 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java

diff --git a/src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java b/src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java
deleted file mode 100644
index 54c7fd159..000000000
--- a/src/main/java/com/microsoft/graph/authentication/InternalAuthConstants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.microsoft.graph.authentication;
-
-/**
- * Internal only.
- * Constants in use for the authentication provider
- */
-public class InternalAuthConstants {
-    /** The bearer value for the authorization request header, contains a space */
-    public static final String BEARER = "Bearer ";
-    /** The authorization request header name */
-    public static final String AUTHORIZATION_HEADER = "Authorization";
-}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index c92707f5f..c359b6528 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -22,6 +22,10 @@
  * An implementation of the Authentication Provider with Azure-identity
  */
 public class TokenCredentialAuthProvider implements IAuthenticationProvider<Request> {
+    /** The bearer value for the authorization request header, contains a space */
+    protected static final String BEARER = "Bearer ";
+    /** The authorization request header name */
+    protected static final String AUTHORIZATION_HEADER = "Authorization";
 
     /** TokenCredential expected from user */
     private final TokenCredential tokenCredential;
@@ -87,7 +91,7 @@ public void authenticateRequest(@Nonnull final IHttpRequest request) throws Auth
         }
         final URL requestUrl = request.getRequestUrl();
         if(requestUrl != null && ShouldAuthenticateRequest(requestUrl)) {
-            request.addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken());
+            request.addHeader(AUTHORIZATION_HEADER, BEARER + getAccessToken());
         }
     }
 
@@ -106,7 +110,7 @@ public Request authenticateRequest(@Nonnull final Request request) throws Authen
         final HttpUrl requestUrl = request.url();
         if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.url())) {
             return request.newBuilder()
-                    .addHeader(InternalAuthConstants.AUTHORIZATION_HEADER, InternalAuthConstants.BEARER + getAccessToken())
+                    .addHeader(AUTHORIZATION_HEADER, BEARER + getAccessToken())
                     .build();
         } else {
             return request;
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 03f9a0ca7..461c135d7 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -40,13 +40,13 @@ public void TokenCredentialAuthProviderTestICoreAuthentication() throws Authenti
             final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
             // Act
-            Assert.assertNull(request.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+            Assert.assertNull(request.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
             final Request authenticatedRequest = authProvider.authenticateRequest(request);
 
             // Assert
             Assert.assertEquals(request.url(), authenticatedRequest.url());
-            Assert.assertNotNull(authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
-            assertEquals(InternalAuthConstants.BEARER + testToken, authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+            Assert.assertNotNull(authenticatedRequest.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
+            assertEquals(TokenCredentialAuthProvider.BEARER + testToken, authenticatedRequest.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
         }
     }
 
@@ -77,8 +77,8 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
             Assert.assertFalse(request.getHeaders().isEmpty());
 
             //Assert
-            Assert.assertTrue(request.getHeaders().get(0).getName().equals(InternalAuthConstants.AUTHORIZATION_HEADER));
-            Assert.assertTrue(request.getHeaders().get(0).getValue().equals(InternalAuthConstants.BEARER + this.testToken));
+            Assert.assertTrue(request.getHeaders().get(0).getName().equals(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
+            Assert.assertTrue(request.getHeaders().get(0).getValue().equals(TokenCredentialAuthProvider.BEARER + this.testToken));
         }
     }
     @Test
@@ -90,12 +90,12 @@ public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreA
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
         //Act
-        Assert.assertNull(request.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertNull(request.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
         final Request authenticatedRequest = authProvider.authenticateRequest(request);
 
         //Assert
         Assert.assertEquals(request.url(), authenticatedRequest.url());
-        Assert.assertNull(authenticatedRequest.header(InternalAuthConstants.AUTHORIZATION_HEADER));
+        Assert.assertNull(authenticatedRequest.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
     }
 
     @Test

From 7542277a2bb52d9cde765a8523c7f752230c2e7b Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 10:06:37 -0500
Subject: [PATCH 115/213] - moves some of the resuable methods for auth
 provider in a common ancestor

---
 .../BaseAuthenticationProvider.java           | 27 +++++++++++++++++++
 .../TokenCredentialAuthProvider.java          | 12 +--------
 2 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java

diff --git a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
new file mode 100644
index 000000000..0c7b41a14
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
@@ -0,0 +1,27 @@
+package com.microsoft.graph.authentication;
+
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Locale;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Provides basic common methods for all authentication providers
+ */
+public abstract class BaseAuthenticationProvider<T> implements IAuthenticationProvider<T> {
+    private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
+    /**
+     * Determines whether a request should be authenticated or not based on it's url.
+     * If you're implementing a custom provider, call that method first before getting the token
+     * @param requestUrl request URL that is about to be executed
+     * @return whether a token should be attached to this request
+     */
+    protected boolean ShouldAuthenticateRequest(@Nonnull final URL requestUrl) {
+        if(requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
+            return false;
+        final String hostName = requestUrl.getHost().toLowerCase(Locale.getDefault());
+        return validGraphHostNames.contains(hostName);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index c359b6528..40f075f2e 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -12,16 +12,14 @@
 import java.net.URL;
 import java.time.Duration;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 
 import javax.annotation.Nonnull;
 
 /**
  * An implementation of the Authentication Provider with Azure-identity
  */
-public class TokenCredentialAuthProvider implements IAuthenticationProvider<Request> {
+public class TokenCredentialAuthProvider extends BaseAuthenticationProvider<Request> {
     /** The bearer value for the authorization request header, contains a space */
     protected static final String BEARER = "Bearer ";
     /** The authorization request header name */
@@ -117,14 +115,6 @@ public Request authenticateRequest(@Nonnull final Request request) throws Authen
         }
     }
 
-    private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
-    private boolean ShouldAuthenticateRequest(@Nonnull final URL requestUrl) {
-        if(requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
-            return false;
-        final String hostName = requestUrl.getHost().toLowerCase(Locale.getDefault());
-        return validGraphHostNames.contains(hostName);
-    }
-
     /**
      * Returns an AccessToken as a string
      *

From f59e6764dc4c79e8ab4d6ec6976ccb8dddc76855 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 11:02:00 -0500
Subject: [PATCH 116/213] - refactors authentication interface to use URL
 instead of deeply tied request

---
 .../BaseAuthenticationProvider.java           |   4 +-
 .../IAuthenticationProvider.java              |  22 +--
 .../TokenCredentialAuthProvider.java          |  91 ++-----------
 .../com/microsoft/graph/core/BaseClient.java  |   9 +-
 .../exceptions/AuthenticationException.java   |  33 -----
 .../graph/httpcore/AuthenticationHandler.java |  28 +++-
 .../microsoft/graph/httpcore/HttpClients.java |   2 +-
 .../BaseAuthenticationProviderTest.java       |  70 ++++++++++
 .../TokenCredentialAuthProviderTest.java      | 125 ++++--------------
 .../graph/core/GraphServiceClientTest.java    |   3 +-
 .../httpcore/AuthenticationHandlerTest.java   |  11 +-
 11 files changed, 149 insertions(+), 249 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
 create mode 100644 src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java

diff --git a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
index 0c7b41a14..9de3b8a3b 100644
--- a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
@@ -10,7 +10,7 @@
 /**
  * Provides basic common methods for all authentication providers
  */
-public abstract class BaseAuthenticationProvider<T> implements IAuthenticationProvider<T> {
+public abstract class BaseAuthenticationProvider implements IAuthenticationProvider {
     private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
     /**
      * Determines whether a request should be authenticated or not based on it's url.
@@ -18,7 +18,7 @@ public abstract class BaseAuthenticationProvider<T> implements IAuthenticationPr
      * @param requestUrl request URL that is about to be executed
      * @return whether a token should be attached to this request
      */
-    protected boolean ShouldAuthenticateRequest(@Nonnull final URL requestUrl) {
+    protected boolean shouldAuthenticateRequestWithUrl(@Nonnull final URL requestUrl) {
         if(requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
             return false;
         final String hostName = requestUrl.getHost().toLowerCase(Locale.getDefault());
diff --git a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
index cb1691bf4..ae1f478f4 100644
--- a/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/IAuthenticationProvider.java
@@ -1,28 +1,20 @@
 package com.microsoft.graph.authentication;
 
-import javax.annotation.Nonnull;
-
-import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.http.IHttpRequest;
+import java.net.URL;
+import java.util.concurrent.CompletableFuture;
 
+import javax.annotation.Nonnull;
 
 /**
  * Authenticates requests to be sent to the API
- * @param <NativeRequestType> the type of the http native http request from the http client library
  */
-public interface IAuthenticationProvider<NativeRequestType> {
-    /**
-     * Authenticates the request
-     *
-     * @param request the request to authenticate
-     */
-    void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException;
+public interface IAuthenticationProvider {
     /**
      * Authenticates the request
      *
-     * @param request the request to authenticate
-     * @return Request with Authorization header added to it
+     * @param requestUrl the outgoing request URL
+     * @return a future with the token
      */
     @Nonnull
-    NativeRequestType authenticateRequest(@Nonnull final NativeRequestType request) throws AuthenticationException;
+    CompletableFuture<String> getAuthorizationTokenAsync(@Nonnull final URL requestUrl);
 }
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 40f075f2e..2cb2f5fb7 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -1,40 +1,25 @@
 package com.microsoft.graph.authentication;
 
-import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
-import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.http.IHttpRequest;
-
-import okhttp3.HttpUrl;
-import okhttp3.Request;
 
 import java.net.URL;
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 import javax.annotation.Nonnull;
 
 /**
  * An implementation of the Authentication Provider with Azure-identity
  */
-public class TokenCredentialAuthProvider extends BaseAuthenticationProvider<Request> {
-    /** The bearer value for the authorization request header, contains a space */
-    protected static final String BEARER = "Bearer ";
-    /** The authorization request header name */
-    protected static final String AUTHORIZATION_HEADER = "Authorization";
-
+public class TokenCredentialAuthProvider extends BaseAuthenticationProvider {
     /** TokenCredential expected from user */
     private final TokenCredential tokenCredential;
     /** Context options which can be optionally set by the user */
     private final TokenRequestContext context;
-    /** maximum delay to wait for token obtention */
-    private final Duration tokenBlockTimeout;
     /** Default scope to use when no scopes are provided */
     private static final String DEFAULT_GRAPH_SCOPE = "https://graph.microsoft.com/.default";
-    /** Default timeout for token obtention, set to 10 minutes in case of interactive flows to give time to the end user */
-    private static final long DEFAULT_TOKEN_TIMEOUT = 10;
     /**
      * Creates an Authentication provider using a passed in TokenCredential
      *
@@ -44,75 +29,22 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
         this(Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}), tokenCredential);
     }
 
-    /**
-     * Creates an Authentication provider using a TokenCredential and list of scopes with default timeout (10 minutes)
-     *
-     * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
-     * @param scopes Specified desired scopes of the Auth Provider
-     */
-    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) {
-        this(scopes, Duration.ofMinutes(DEFAULT_TOKEN_TIMEOUT), tokenCredential);
-    }
-
     /**
      * Creates an Authentication provider using a TokenCredential and list of scopes
      *
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      * @param scopes Specified desired scopes of the Auth Provider
-     * @param tokenObtentionTimeout Maximum time to wait for token obtention. Default 10 minutes. Use lower value on application with stable connectivity and no user interactions.
      */
-    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final Duration tokenObtentionTimeout, @Nonnull final TokenCredential tokenCredential) {
+    public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) {
         if(tokenCredential == null) {
             throw new IllegalArgumentException("tokenCredential parameter cannot be null.");
         }
-        if(tokenObtentionTimeout == null) {
-            throw new IllegalArgumentException("tokenObtentionTimout parameter cannot be null");
-        }
         if(scopes == null || scopes.isEmpty()) {
             throw new IllegalArgumentException("scopes parameter cannot be null or empty");
         }
         this.context = new TokenRequestContext();
         this.context.setScopes(scopes);
         this.tokenCredential = tokenCredential;
-        this.tokenBlockTimeout = tokenObtentionTimeout;
-    }
-
-    /**
-     * Authenticates the request
-     *
-     * @param request the request to authenticate
-     */
-    @Override
-    public void authenticateRequest(@Nonnull final IHttpRequest request) throws AuthenticationException {
-        if(request == null) {
-            throw new IllegalArgumentException("request parameter cannot be null.");
-        }
-        final URL requestUrl = request.getRequestUrl();
-        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl)) {
-            request.addHeader(AUTHORIZATION_HEADER, BEARER + getAccessToken());
-        }
-    }
-
-    /**
-     * Authenticates the request
-     *
-     * @param request the request to authenticate
-     * @return Request with Authorization header added to it
-     */
-    @Override
-    @Nonnull
-    public Request authenticateRequest(@Nonnull final Request request) throws AuthenticationException {
-        if(request == null) {
-            throw new IllegalArgumentException("request parameter cannot be null.");
-        }
-        final HttpUrl requestUrl = request.url();
-        if(requestUrl != null && ShouldAuthenticateRequest(requestUrl.url())) {
-            return request.newBuilder()
-                    .addHeader(AUTHORIZATION_HEADER, BEARER + getAccessToken())
-                    .build();
-        } else {
-            return request;
-        }
     }
 
     /**
@@ -120,12 +52,15 @@ public Request authenticateRequest(@Nonnull final Request request) throws Authen
      *
      * @return String representing the retrieved AccessToken
      */
-    private String getAccessToken() throws AuthenticationException {
-        try {
-            final AccessToken token = this.tokenCredential.getToken(this.context).block(this.tokenBlockTimeout);
-            return token.getToken();
-        } catch (RuntimeException e) {
-            throw new AuthenticationException("Authentication failed or timed out.", e);
-        }
+    public CompletableFuture<String> getAuthorizationTokenAsync(@Nonnull final URL requestUrl) {
+        if(requestUrl == null)
+            throw new IllegalArgumentException("requestUrl parameter cannot be null");
+        else if(shouldAuthenticateRequestWithUrl(requestUrl))
+            return this.tokenCredential
+                        .getToken(this.context)
+                        .toFuture()
+                        .thenApply(resp -> resp.getToken());
+        else
+            return CompletableFuture.completedFuture((String)null);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 1cb247915..6a285cf38 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -119,9 +119,9 @@ public static class Builder<httpClientType, httpRequestType> {
 		private IHttpProvider httpProvider;
 		private ILogger logger;
 		private httpClientType httpClient;
-		private IAuthenticationProvider<httpRequestType> auth;
+		private IAuthenticationProvider auth;
 
-		private IAuthenticationProvider<httpRequestType> getAuthenticationProvider() {
+		private IAuthenticationProvider getAuthenticationProvider() {
 			if(auth == null) {
 				throw new NullPointerException("auth");
 			} else {
@@ -142,10 +142,9 @@ private ISerializer getSerializer() {
 				return serializer;
 			}
 		}
-		@SuppressWarnings("unchecked")
 		private httpClientType getHttpClient() {
 			if(httpClient == null) {
-				return (httpClientType)HttpClients.createDefault((IAuthenticationProvider<Request>)getAuthenticationProvider());
+				return (httpClientType)HttpClients.createDefault(getAuthenticationProvider());
 			} else {
 				return httpClient;
 			}
@@ -221,7 +220,7 @@ public Builder<httpClientType, httpRequestType> httpClient(@Nonnull final httpCl
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, httpRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider<httpRequestType> auth) {
+		public Builder<httpClientType, httpRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
 			checkNotNull(auth, "auth");
 			this.auth = auth;
 			return this;
diff --git a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java b/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
deleted file mode 100644
index 8e4ef9abf..000000000
--- a/src/main/java/com/microsoft/graph/exceptions/AuthenticationException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.microsoft.graph.exceptions;
-
-import javax.annotation.Nonnull;
-
-import com.microsoft.graph.core.ClientException;
-
-/**
- * Exceptions thrown by the authentication provider when the authentication sequence has failed
- */
-public class AuthenticationException extends ClientException {
-
-    /**
-     * serial id
-     */
-    private static final long serialVersionUID = 8708883112518988965L;
-    /**
-     * Creates a new AuthenticationException with a specified Error as well as an inner exception
-     *
-     * @param message The specified error message causing exception to be thrown
-     * @param rootCause The underlying exception causing AuthenticationException to be thrown
-     */
-    public AuthenticationException(@Nonnull final String message, @Nonnull final Throwable rootCause) {
-        super(message, rootCause);
-    }
-    /**
-     * Creates a new AuthenticationException with a specified Error as well as an inner exception
-     *
-     * @param rootCause The underlying exception causing AuthenticationException to be thrown
-     */
-    public AuthenticationException(@Nonnull final Throwable rootCause) {
-        super(rootCause.getMessage(), rootCause);
-    }
-}
diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index 26a1aa5d9..306e35e7b 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -1,9 +1,10 @@
 package com.microsoft.graph.httpcore;
 
 import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
-import com.microsoft.graph.exceptions.AuthenticationException;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -19,19 +20,22 @@
  * Interceptor responsible for injecting the token in the request headers
  */
 public class AuthenticationHandler implements Interceptor {
-
+    /** The bearer value for the authorization request header, contains a space */
+    protected static final String BEARER = "Bearer ";
+    /** The authorization request header name */
+    protected static final String AUTHORIZATION_HEADER = "Authorization";
     /**
      * The current middleware type
      */
     public final MiddlewareType MIDDLEWARE_TYPE = MiddlewareType.AUTHENTICATION;
 
-    private IAuthenticationProvider<Request> authProvider;
+    private IAuthenticationProvider authProvider;
 
     /**
      * Initialize a the handler with a authentication provider
      * @param authProvider the authentication provider to use
      */
-    public AuthenticationHandler(@Nonnull final IAuthenticationProvider<Request> authProvider) {
+    public AuthenticationHandler(@Nonnull final IAuthenticationProvider authProvider) {
         this.authProvider = authProvider;
     }
 
@@ -45,9 +49,19 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
         originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 
         try {
-            final Request authenticatedRequest = authProvider.authenticateRequest(originalRequest);
-            return authenticatedRequest == null ? chain.proceed(originalRequest) : chain.proceed(authenticatedRequest);
-        } catch (AuthenticationException ex) {
+            final CompletableFuture<String> future = authProvider.getAuthorizationTokenAsync(originalRequest.url().url());
+            if(future == null)
+                return chain.proceed(originalRequest);
+            final String accessToken = future.get();
+            if(accessToken == null)
+                return chain.proceed(originalRequest);
+            else {
+                return chain.proceed(originalRequest
+                                        .newBuilder()
+                                        .addHeader(AUTHORIZATION_HEADER, BEARER + accessToken)
+                                        .build());
+            }
+        } catch (InterruptedException | ExecutionException ex) {
             throw new IOException(ex);
         }
     }
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index 5d8b8fa29..80fc0eab0 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -43,7 +43,7 @@ public static Builder custom() {
      * @return OkHttpClient build with authentication provider given, default redirect and default retry handlers
      */
     @Nonnull
-    public static OkHttpClient createDefault(@Nonnull final IAuthenticationProvider<Request> auth) {
+    public static OkHttpClient createDefault(@Nonnull final IAuthenticationProvider auth) {
         return custom()
                 .addInterceptor(new AuthenticationHandler(auth))
                 .addInterceptor(new RetryHandler())
diff --git a/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java b/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java
new file mode 100644
index 000000000..81f0bc3b8
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java
@@ -0,0 +1,70 @@
+package com.microsoft.graph.authentication;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+public class BaseAuthenticationProviderTest {
+    final BaseAuthenticationProvider authProvider = new BaseAuthenticationProvider() {
+
+        @Override
+        public CompletableFuture<String> getAuthorizationTokenAsync(URL requestUrl) {
+            return CompletableFuture.completedFuture((String)null);
+        }
+    };
+    private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
+
+    @Test
+    public void providerAddsTokenOnAllNationalAndPublicClouds() throws MalformedURLException  {
+
+        for(final String hostName : validGraphHostNames) {
+            // Arrange
+            final URL url = new URL("https://"+ hostName);
+            // Act
+            final boolean result = authProvider.shouldAuthenticateRequestWithUrl(url);
+
+            // Assert
+            assertTrue(result);
+        }
+    }
+    @Test
+    public void providerDoesNotAddTokenOnInvalidDomains() throws MalformedURLException {
+        // Arrange
+        final URL url = new URL("https://localhost");
+
+        //Act
+        final boolean result = authProvider.shouldAuthenticateRequestWithUrl(url);
+
+        //Assert
+        assertFalse(result);
+    }
+    @Test
+    public void providerDoesNotAddTokenOnInvalidProtocols() throws MalformedURLException {
+        //Arrange
+        final URL url = new URL("http://graph.microsoft.com");
+
+        //Act
+        final boolean result = authProvider.shouldAuthenticateRequestWithUrl(url);
+
+        //Assert
+        assertFalse(result);
+    }
+    @Test
+    public void providerDoesNotAddTokenOnNullUrls() throws MalformedURLException {
+        //Arrange
+        final URL url = (URL)null;
+
+        //Act
+        final boolean result = authProvider.shouldAuthenticateRequestWithUrl(url);
+
+        //Assert
+        assertFalse(result);
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 461c135d7..7ea4146ce 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -1,135 +1,56 @@
 package com.microsoft.graph.authentication;
 
 import com.azure.core.credential.TokenCredential;
-import com.microsoft.graph.exceptions.AuthenticationException;
-import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.mocks.MockTokenCredential;
-import com.microsoft.graph.options.HeaderOption;
 
-import okhttp3.Request;
-import org.junit.Assert;
 import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 public class TokenCredentialAuthProviderTest {
 
     public final String testToken = "CredentialTestToken";
-    private static final HashSet<String> validGraphHostNames = new HashSet<>(Arrays.asList("graph.microsoft.com", "graph.microsoft.us", "dod-graph.microsoft.us", "graph.microsoft.de", "microsoftgraph.chinacloudapi.cn"));
 
     @Test
-    public void TokenCredentialAuthProviderTestICoreAuthentication() throws AuthenticationException {
-
-        for(final String hostName : validGraphHostNames) {
-            // Arrange
-            final Request request = new Request.Builder().url("https://" + hostName).build();
-            final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-            final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
-
-            // Act
-            Assert.assertNull(request.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
-            final Request authenticatedRequest = authProvider.authenticateRequest(request);
-
-            // Assert
-            Assert.assertEquals(request.url(), authenticatedRequest.url());
-            Assert.assertNotNull(authenticatedRequest.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
-            assertEquals(TokenCredentialAuthProvider.BEARER + testToken, authenticatedRequest.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
-        }
-    }
-
-    @Test
-    public void TokenCredentialAuthProviderTestIAuthentication() throws AuthenticationException, MalformedURLException {
-
-        for(final String hostName : validGraphHostNames) {
-            // Arrange
-            final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-            final IHttpRequest request = mock(IHttpRequest.class);
-            final List<HeaderOption> headersOptions = new ArrayList<>();
-            when(request.getRequestUrl()).thenReturn(new URL("https://" + hostName));
-            doAnswer(new Answer<Void>() {
-
-                @Override
-                public Void answer(InvocationOnMock invocation) throws Throwable {
-                    headersOptions.add(new HeaderOption((String)invocation.getArguments()[0], (String)invocation.getArguments()[1]));
-                    return null;
-                }
-
-            }).when(request).addHeader(any(String.class), any(String.class));
-            when(request.getHeaders()).thenReturn(headersOptions);
-            final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
-
-            //Act
-            Assert.assertTrue(request.getHeaders().isEmpty());
-            authProvider.authenticateRequest(request);
-            Assert.assertFalse(request.getHeaders().isEmpty());
-
-            //Assert
-            Assert.assertTrue(request.getHeaders().get(0).getName().equals(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
-            Assert.assertTrue(request.getHeaders().get(0).getValue().equals(TokenCredentialAuthProvider.BEARER + this.testToken));
-        }
-    }
-    @Test
-    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestICoreAuthentication() throws AuthenticationException {
-
-        //Arrange
-        final Request request = new Request.Builder().url("https://localhost").build();
+    public void providerAddsTokenOnValidHostName() throws MalformedURLException, InterruptedException,
+            ExecutionException {
+        // Arrange
+        final URL url = new URL("https://graph.microsoft.com");
         final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
-        //Act
-        Assert.assertNull(request.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
-        final Request authenticatedRequest = authProvider.authenticateRequest(request);
+        // Act
+        final String token = authProvider.getAuthorizationTokenAsync(url).get();
 
-        //Assert
-        Assert.assertEquals(request.url(), authenticatedRequest.url());
-        Assert.assertNull(authenticatedRequest.header(TokenCredentialAuthProvider.AUTHORIZATION_HEADER));
+        // Assert
+        assertEquals(token, testToken);
     }
-
     @Test
-    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidDomainsTestIAuthentication() throws AuthenticationException,
-            MalformedURLException {
-
-        //Arrange
+    public void providerDoesntAddTokenOnInvalidHostName() throws MalformedURLException, InterruptedException,
+            ExecutionException {
+        // Arrange
+        final URL url = new URL("https://localhost");
         final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        final IHttpRequest request = mock(IHttpRequest.class);
-        when(request.getRequestUrl()).thenReturn(new URL("https://localhost"));
         final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
 
-        //Act
-        Assert.assertTrue(request.getHeaders().isEmpty());
-        authProvider.authenticateRequest(request);
+        // Act
+        final String token = authProvider.getAuthorizationTokenAsync(url).get();
 
-        //Assert
-        Assert.assertTrue(request.getHeaders().isEmpty());
+        // Assert
+        assertNull(token);
     }
     @Test
-    public void TokenCredentialAuthProviderDoesNotAddTokenOnInvalidProtocols() throws AuthenticationException,
-            MalformedURLException {
-
-        //Arrange
-        final TokenCredential mockCredential = MockTokenCredential.getMockTokenCredential();
-        final IHttpRequest request = mock(IHttpRequest.class);
-        when(request.getRequestUrl()).thenReturn(new URL("http://graph.microsoft.com"));
-        final TokenCredentialAuthProvider authProvider = new TokenCredentialAuthProvider(mockCredential);
-
-        //Act
-        Assert.assertTrue(request.getHeaders().isEmpty());
-        authProvider.authenticateRequest(request);
-
-        //Assert
-        Assert.assertTrue(request.getHeaders().isEmpty());
+    public void providerDefensivePrograming() {
+        assertThrows("should throw on null credentials", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null); });
+        assertThrows("should throw on null scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null, mock(TokenCredential.class)); });
+        assertThrows("should throw on empty scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(new ArrayList<String>(), mock(TokenCredential.class)); });
+        final TokenCredentialAuthProvider provider = new TokenCredentialAuthProvider(mock(TokenCredential.class));
+        assertThrows("should throw on null url", IllegalArgumentException.class, () -> { provider.getAuthorizationTokenAsync(null); });
     }
 }
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index a3f72ae3d..3134c3c96 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -22,8 +22,7 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 public class GraphServiceClientTest {
-    @SuppressWarnings("unchecked")
-    private IAuthenticationProvider<Request> getAuthProvider() {
+    private IAuthenticationProvider getAuthProvider() {
         return mock(IAuthenticationProvider.class);
     }
 
diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index 07db2a041..e31912d7c 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -1,11 +1,14 @@
 package com.microsoft.graph.httpcore;
 
-
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.net.URL;
+import java.util.concurrent.CompletableFuture;
 
 import org.junit.Test;
 
@@ -14,14 +17,14 @@
 
 public class AuthenticationHandlerTest {
     @Test
-    @SuppressWarnings("unchecked")
     public void testAuthenticationHandler() throws Exception {
-        IAuthenticationProvider<Request> authProvider = mock(IAuthenticationProvider.class);
+        IAuthenticationProvider authProvider = mock(IAuthenticationProvider.class);
+        when(authProvider.getAuthorizationTokenAsync(any(URL.class))).thenReturn(CompletableFuture.completedFuture("a token"));
         AuthenticationHandler authHandler = new AuthenticationHandler(authProvider);
         Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/me/").build();
         OkHttpClient client = new OkHttpClient().newBuilder().addInterceptor(authHandler).build();
         client.newCall(request).execute();
-        verify(authProvider, times(1)).authenticateRequest(any(Request.class));
+        verify(authProvider, times(1)).getAuthorizationTokenAsync(any(URL.class));
     }
 
 }

From 9ec6d4e11acef90f69b5b792430fc130459c9366 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 11:06:30 -0500
Subject: [PATCH 117/213] - adds missing nullability annotation

---
 .../graph/authentication/TokenCredentialAuthProvider.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index 2cb2f5fb7..f7904d7cf 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -52,6 +52,7 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
      *
      * @return String representing the retrieved AccessToken
      */
+    @Nonnull
     public CompletableFuture<String> getAuthorizationTokenAsync(@Nonnull final URL requestUrl) {
         if(requestUrl == null)
             throw new IllegalArgumentException("requestUrl parameter cannot be null");

From eae9eb7472b229a815e7fbb89ebd51e315b02f81 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 11:44:20 -0500
Subject: [PATCH 118/213] - removes the need for the generic type of the
 request

---
 .../com/microsoft/graph/core/BaseClient.java  | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 6a285cf38..9fc477aad 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -36,7 +36,6 @@
 import javax.annotation.Nonnull;
 
 import okhttp3.OkHttpClient;
-import okhttp3.Request;
 
 /**
  * A client that communications with an OData service
@@ -105,16 +104,15 @@ public CustomRequestBuilder<JsonObject> customRequest(@Nonnull final String url)
 	 * @return builder to start configuring the client
 	 */
 	@Nonnull
-	public static Builder<OkHttpClient, Request> builder() {
+	public static Builder<OkHttpClient> builder() {
 		return new Builder<>();
 	}
 
 	/**
 	 * Builder to help configure the Graph service client
      * @param <httpClientType> type of the native http library client
-     * @param <httpRequestType> type of the native http library request
 	 */
-	public static class Builder<httpClientType, httpRequestType> {
+	public static class Builder<httpClientType> {
 		private ISerializer serializer;
 		private IHttpProvider httpProvider;
 		private ILogger logger;
@@ -141,7 +139,8 @@ private ISerializer getSerializer() {
 			} else {
 				return serializer;
 			}
-		}
+        }
+        @SuppressWarnings("unchecked")
 		private httpClientType getHttpClient() {
 			if(httpClient == null) {
 				return (httpClientType)HttpClients.createDefault(getAuthenticationProvider());
@@ -165,7 +164,7 @@ private IHttpProvider getHttpProvider() {
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, httpRequestType> serializer(@Nonnull final ISerializer serializer) {
+		public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
 			checkNotNull(serializer, "serializer");
 			this.serializer = serializer;
 			return this;
@@ -179,7 +178,7 @@ public Builder<httpClientType, httpRequestType> serializer(@Nonnull final ISeria
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, httpRequestType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
+		public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
 			checkNotNull(httpProvider, "httpProvider");
 			this.httpProvider = httpProvider;
 			return this;
@@ -193,7 +192,7 @@ public Builder<httpClientType, httpRequestType> httpProvider(@Nonnull final IHtt
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, httpRequestType> logger(@Nonnull final ILogger logger) {
+		public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
 			checkNotNull(logger, "logger");
 			this.logger = logger;
 			return this;
@@ -207,7 +206,7 @@ public Builder<httpClientType, httpRequestType> logger(@Nonnull final ILogger lo
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, httpRequestType> httpClient(@Nonnull final httpClientType client) {
+		public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
 			checkNotNull(client, "client");
 			this.httpClient = client;
 			return this;
@@ -220,7 +219,7 @@ public Builder<httpClientType, httpRequestType> httpClient(@Nonnull final httpCl
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, httpRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
+		public Builder<httpClientType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
 			checkNotNull(auth, "auth");
 			this.auth = auth;
 			return this;

From 6f6098db2703ca0b46406a11053182f5bd3180d1 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 11:44:39 -0500
Subject: [PATCH 119/213] - updates guidance to follow new authentication
 provider

---
 readme.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/readme.md b/readme.md
index f2a7ab051..6ceebb962 100644
--- a/readme.md
+++ b/readme.md
@@ -48,20 +48,17 @@ Register your application by following the steps at [Register your app with the
 
 ### 2.2 Create an IAuthenticationProvider object
 
-An instance of the **HttpClients** class handles building client. To create a new instance of this class, you need to provide an instance of `ICoreAuthenticationProvider`, which can authenticate requests to Microsoft Graph.
+An instance of the **HttpClients** class handles building client. To create a new instance of this class, you need to provide an instance of `IAuthenticationProvider`, which can authenticate requests to Microsoft Graph.
 
-### To get instance of HttpClients
-
-Auth in Java app [here](https://github.com/microsoftgraph/msgraph-sdk-java-auth)
-
-Auth in Android app [here](https://github.com/microsoftgraph/msgraph-sdk-android-auth)
+For an example of how to get an authentication provider, see [the samples](https://github.com/microsoftgraph/msgraph-sdk-java-core/blob/master/samples).
 
 ### 2.3 Get a HttpClients object
 
+
 You must get a **HttpClients** object to make requests against the service.
 
 ```java
-OkHttpClient client = HttpClients.createDefault(iCoreAuthenticationProvider);
+OkHttpClient client = HttpClients.createDefault(iAuthenticationProvider);
 ```
 
 ## 3. Make requests against the service

From fb6e1f18bb1e514e5cdf7949669eec3b3c8cd4ee Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 11:55:09 -0500
Subject: [PATCH 120/213] - fixes samples after removal of auth exception

---
 samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java | 3 +--
 .../src/main/java/interactiveBrowserMain.java                  | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index cc11d9af2..552ea8456 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -1,7 +1,6 @@
 import com.azure.identity.DeviceCodeCredential;
 import com.azure.identity.DeviceCodeCredentialBuilder;
 import com.microsoft.graph.authentication.TokenCredentialAuthProvider;
-import com.microsoft.graph.exceptions.AuthenticationException;
 import com.microsoft.graph.httpcore.HttpClients;
 import okhttp3.*;
 
@@ -20,7 +19,7 @@ public class deviceCodeFlowMain {
     //Set the scopes for your ms-graph request
     private final static List<String> SCOPES = Arrays.asList("User.ReadBasic.All", "User.Read");
 
-    public static void main(String[] args) throws AuthenticationException {
+    public static void main(String[] args) throws Exception {
         final DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
                 .clientId(CLIENT_ID)
                 .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
index b9b57214f..e99940c17 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
@@ -6,7 +6,6 @@
 import com.microsoft.graph.authentication.*;
 import okhttp3.*;
 import com.microsoft.graph.httpcore.HttpClients;
-import com.microsoft.graph.exceptions.*;
 
 public class interactiveBrowserMain {
 

From 603ef3dfc3e849308797a96cfca5aa4dc9c640b4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 13:32:13 -0500
Subject: [PATCH 121/213] - updates link to get auth provider

---
 readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.md b/readme.md
index 6ceebb962..81540feb7 100644
--- a/readme.md
+++ b/readme.md
@@ -50,7 +50,7 @@ Register your application by following the steps at [Register your app with the
 
 An instance of the **HttpClients** class handles building client. To create a new instance of this class, you need to provide an instance of `IAuthenticationProvider`, which can authenticate requests to Microsoft Graph.
 
-For an example of how to get an authentication provider, see [the samples](https://github.com/microsoftgraph/msgraph-sdk-java-core/blob/master/samples).
+For an example of how to get an authentication provider, see [choose a Microsoft Graph authentication provider](https://docs.microsoft.com/graph/sdks/choose-authentication-providers?tabs=Java).
 
 ### 2.3 Get a HttpClients object
 

From 63088d1fb7d221f1b197dc719d05aa99fef89271 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 13:34:29 -0500
Subject: [PATCH 122/213] - switches azure identity dependency to api as it's
 part of our API

---
 gradle/dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 4353dc8c7..ecaacc9d4 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -8,5 +8,5 @@ dependencies {
     implementation 'com.google.guava:guava:29.0-jre'
 
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.azure:azure-identity:1.2.0'
+    api 'com.azure:azure-identity:1.2.0'
 }
\ No newline at end of file

From 100390d0eb0e9a9496957a4a4dda792b0178c695 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 13:46:41 -0500
Subject: [PATCH 123/213] Apply suggestions from code review

---
 samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java  | 2 +-
 .../graph/authentication/BaseAuthenticationProvider.java        | 2 +-
 .../graph/authentication/TokenCredentialAuthProvider.java       | 2 +-
 .../graph/authentication/TokenCredentialAuthProviderTest.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
index 552ea8456..275a36041 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
@@ -22,7 +22,7 @@ public class deviceCodeFlowMain {
     public static void main(String[] args) throws Exception {
         final DeviceCodeCredential deviceCodeCred = new DeviceCodeCredentialBuilder()
                 .clientId(CLIENT_ID)
-                .challengeConsumer(challenge -> {System.out.println(challenge.getMessage());})
+                .challengeConsumer(challenge -> System.out.println(challenge.getMessage()))
                 .build();
 
         final TokenCredentialAuthProvider tokenCredAuthProvider = new TokenCredentialAuthProvider(SCOPES, deviceCodeCred);
diff --git a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
index 9de3b8a3b..9843c48ad 100644
--- a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
@@ -19,7 +19,7 @@ public abstract class BaseAuthenticationProvider implements IAuthenticationProvi
      * @return whether a token should be attached to this request
      */
     protected boolean shouldAuthenticateRequestWithUrl(@Nonnull final URL requestUrl) {
-        if(requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
+        if (requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
             return false;
         final String hostName = requestUrl.getHost().toLowerCase(Locale.getDefault());
         return validGraphHostNames.contains(hostName);
diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index f7904d7cf..c77e823e0 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -26,7 +26,7 @@ public class TokenCredentialAuthProvider extends BaseAuthenticationProvider {
      * @param tokenCredential Credential object inheriting the TokenCredential interface used to instantiate the Auth Provider
      */
     public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredential) {
-        this(Arrays.asList(new String[] {DEFAULT_GRAPH_SCOPE}), tokenCredential);
+        this(Arrays.asList(DEFAULT_GRAPH_SCOPE), tokenCredential);
     }
 
     /**
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 7ea4146ce..5522ff128 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -46,7 +46,7 @@ public void providerDoesntAddTokenOnInvalidHostName() throws MalformedURLExcepti
         assertNull(token);
     }
     @Test
-    public void providerDefensivePrograming() {
+    public void providerDefensiveProgramming() {
         assertThrows("should throw on null credentials", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null); });
         assertThrows("should throw on null scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null, mock(TokenCredential.class)); });
         assertThrows("should throw on empty scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(new ArrayList<String>(), mock(TokenCredential.class)); });

From 2ec247f5be86b3c05f3350b081da8121e9ad1e52 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 13:55:15 -0500
Subject: [PATCH 124/213] - fixes file/class casing to match conventions

---
 .../java/{deviceCodeFlowMain.java => DeviceCodeFlowMain.java}   | 2 +-
 ...{interactiveBrowserMain.java => InteractiveBrowserMain.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename samples/deviceCodeSample/src/main/java/{deviceCodeFlowMain.java => DeviceCodeFlowMain.java} (98%)
 rename samples/interactiveBrowserSample/src/main/java/{interactiveBrowserMain.java => InteractiveBrowserMain.java} (97%)

diff --git a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java b/samples/deviceCodeSample/src/main/java/DeviceCodeFlowMain.java
similarity index 98%
rename from samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
rename to samples/deviceCodeSample/src/main/java/DeviceCodeFlowMain.java
index 275a36041..b39fb3ad7 100644
--- a/samples/deviceCodeSample/src/main/java/deviceCodeFlowMain.java
+++ b/samples/deviceCodeSample/src/main/java/DeviceCodeFlowMain.java
@@ -9,7 +9,7 @@
 import java.util.List;
 
 
-public class deviceCodeFlowMain {
+public class DeviceCodeFlowMain {
 
     //Replace CLIENT_ID with your own client id from an app that is configured according to the requirements below
     //for requirements visit:
diff --git a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java b/samples/interactiveBrowserSample/src/main/java/InteractiveBrowserMain.java
similarity index 97%
rename from samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
rename to samples/interactiveBrowserSample/src/main/java/InteractiveBrowserMain.java
index e99940c17..f9eb5a767 100644
--- a/samples/interactiveBrowserSample/src/main/java/interactiveBrowserMain.java
+++ b/samples/interactiveBrowserSample/src/main/java/InteractiveBrowserMain.java
@@ -7,7 +7,7 @@
 import okhttp3.*;
 import com.microsoft.graph.httpcore.HttpClients;
 
-public class interactiveBrowserMain {
+public class InteractiveBrowserMain {
 
     //Replace CLIENT_ID with your own client id from an adequately configured app
     //for requirements visit:

From 870bd0d0621589a3420079d5cb9cc8ce4b7bd38a Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 13:55:37 -0500
Subject: [PATCH 125/213] - aligns locale

---
 .../graph/authentication/BaseAuthenticationProvider.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
index 9843c48ad..4b73a2177 100644
--- a/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/BaseAuthenticationProvider.java
@@ -21,7 +21,7 @@ public abstract class BaseAuthenticationProvider implements IAuthenticationProvi
     protected boolean shouldAuthenticateRequestWithUrl(@Nonnull final URL requestUrl) {
         if (requestUrl == null || !requestUrl.getProtocol().toLowerCase(Locale.ROOT).equals("https"))
             return false;
-        final String hostName = requestUrl.getHost().toLowerCase(Locale.getDefault());
+        final String hostName = requestUrl.getHost().toLowerCase(Locale.ROOT);
         return validGraphHostNames.contains(hostName);
     }
 }

From f849b69212049eda832f90fa8993a989cafcbe07 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 22 Jan 2021 14:15:37 -0500
Subject: [PATCH 126/213] - update dependencies for github dependency tree

---
 pom.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index dc77c1858..ed1c9c54a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
    
 	<groupId>com.microsoft.graph</groupId>
 	<artifactId>microsoft-graph-core</artifactId>
-	<version>1.0.6</version>
+	<version>2.0.0</version>
 	<packaging>pom</packaging>
 
 	<dependencies>
@@ -17,10 +17,20 @@
 			<artifactId>gson</artifactId>
 			<version>2.8.6</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>29.0-jre</version>
+		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>gson</artifactId>
-			<version>3.12.1</version>
+			<version>4.9.0</version>
+		</dependency>
+		<dependency>
+			<groupId>com.azure</groupId>
+			<artifactId>azure-identity</artifactId>
+			<version>1.2.0</version>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file

From cf40f44bd175e7999f0dc6557c2f85af613cb0d3 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 25 Jan 2021 09:22:20 -0500
Subject: [PATCH 127/213] - major version bump

---
 gradle.properties                                             | 4 ++--
 readme.md                                                     | 4 ++--
 .../java/com/microsoft/graph/httpcore/TelemetryHandler.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 8defcc2e3..1dfad7c03 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,9 +23,9 @@ org.gradle.jvmargs=-XX:MaxPermSize=512m -Xmx2g
 
 mavenGroupId         = com.microsoft.graph
 mavenArtifactId      = microsoft-graph-core
-mavenMajorVersion    = 1
+mavenMajorVersion    = 2
 mavenMinorVersion    = 0
-mavenPatchVersion    = 7
+mavenPatchVersion    = 0
 mavenArtifactSuffix = 
 nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
diff --git a/readme.md b/readme.md
index 69c561b18..0d27e690f 100644
--- a/readme.md
+++ b/readme.md
@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     // Include the sdk as a dependency
-    implementation 'com.microsoft.graph:microsoft-graph-core:1.0.7'
+    implementation 'com.microsoft.graph:microsoft-graph-core:2.0.0'
 }
 ```
 
@@ -32,7 +32,7 @@ Add the dependency in `dependencies` in pom.xml
 <dependency>
 	<groupId>com.microsoft.graph</groupId>
 	<artifactId>microsoft-graph-core</artifactId>
-	<version>1.0.7</version>
+	<version>2.0.0</version>
 </dependency>
 ```
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
index f6775d7c1..a3c6de666 100644
--- 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 = "v1.0.7";
+    public static final String VERSION = "v2.0.0";
     /**
      * Verion prefix
      */

From 61520f24599cb79d80e458b56fb592da92483706 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 25 Jan 2021 14:21:09 -0500
Subject: [PATCH 128/213] - fixes a bug where some higher level classes would
 write to stdout/stderr instead of using the provided logging infrastructure

---
 .../graph/content/MSBatchRequestContent.java  | 24 ++++++++++++++---
 .../graph/content/MSBatchResponseContent.java | 26 +++++++++++++++----
 .../graph/httpcore/RetryHandler.java          | 16 +++++++++++-
 .../content/MSBatchRequestContentTest.java    |  7 +++--
 .../graph/httpcore/RetryHandlerTest.java      |  8 ++++++
 5 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index d9d77f3d1..a8e49ec64 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -20,6 +20,8 @@
 import com.google.gson.JsonPrimitive;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.logger.DefaultLogger;
+import com.microsoft.graph.logger.ILogger;
 import com.google.gson.JsonParseException;
 
 import okhttp3.Headers;
@@ -37,6 +39,7 @@ public class MSBatchRequestContent {
      * Maximum number of requests that can be sent in a batch
      */
     public static final int MAX_NUMBER_OF_REQUESTS = 20;
+    private final ILogger logger;
 
     /**
      * Creates Batch request content using list provided
@@ -44,9 +47,24 @@ public class MSBatchRequestContent {
      * @param batchRequestStepsArray List of batch steps for batching
      */
     public MSBatchRequestContent(@Nonnull final MSBatchRequestStep... batchRequestStepsArray) {
+        this(new DefaultLogger(), batchRequestStepsArray);
+    }
+
+    /**
+     * Creates Batch request content using list provided
+     *
+     * @param batchRequestStepsArray List of batch steps for batching
+     * @param logger logger to use for telemetry
+     */
+    public MSBatchRequestContent(@Nonnull final ILogger logger, @Nonnull final MSBatchRequestStep... batchRequestStepsArray) {
         if (batchRequestStepsArray.length > MAX_NUMBER_OF_REQUESTS)
             throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
 
+        if(logger == null)
+            throw new IllegalArgumentException("logger cannot be null");
+
+        this.logger = logger;
+
         this.batchRequestStepsHashMap = new LinkedHashMap<>();
         for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
             if(requestStep != null)
@@ -136,7 +154,7 @@ public String getBatchRequestContent() {
     @Nonnull
     public MSBatchResponseContent execute(@Nonnull final IBaseClient client) {
         final JsonObject content = getBatchRequestContentAsJson();
-        return new MSBatchResponseContent(client.getServiceRoot() + "/",
+        return new MSBatchResponseContent(logger, client.getServiceRoot() + "/",
                                         content,
                                         client.customRequest("/$batch")
                                                 .buildRequest()
@@ -157,7 +175,7 @@ public CompletableFuture<MSBatchResponseContent> executeAsync(@Nonnull final IBa
         return client.customRequest("/$batch")
             .buildRequest()
             .postAsync(content)
-            .thenApply(resp -> new MSBatchResponseContent(client.getServiceRoot() + "/", content, resp.getAsJsonObject()));
+            .thenApply(resp -> new MSBatchResponseContent(logger, client.getServiceRoot() + "/", content, resp.getAsJsonObject()));
     }
 
     private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
@@ -194,7 +212,7 @@ private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep
             try {
                 contentmap.add("body", requestBodyToJSONObject(batchRequestStep.getRequest()));
             } catch (IOException | JsonParseException e) {
-                e.printStackTrace();
+                logger.logError("error pasing the request JSON body", e);
             }
         }
         return contentmap;
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index 658a2aa55..739463434 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -12,6 +12,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.microsoft.graph.logger.DefaultLogger;
+import com.microsoft.graph.logger.ILogger;
 import com.google.gson.JsonParseException;
 
 import okhttp3.MediaType;
@@ -32,11 +34,23 @@ public class MSBatchResponseContent {
     private LinkedHashMap<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
     private JsonArray batchResponseArray;
     private String nextLink;
+    private final ILogger logger;
 
     /**
      * @param batchResponse OkHttp batch response on execution of batch requests
      */
     public MSBatchResponseContent(@Nullable final Response batchResponse) {
+        this(new DefaultLogger(), batchResponse);
+    }
+
+    /**
+     * @param batchResponse OkHttp batch response on execution of batch requests
+     * @param logger logger to use for telemetry
+     */
+    public MSBatchResponseContent(@Nonnull final ILogger logger, @Nullable final Response batchResponse) {
+        if(logger == null)
+            throw new IllegalArgumentException("logger parameter cannot be null");
+        this.logger = logger;
         update(batchResponse);
         this.message = batchResponse.message();
         this.protocol = batchResponse.protocol();
@@ -47,8 +61,10 @@ public MSBatchResponseContent(@Nullable final Response batchResponse) {
      * @param baseUrl the base service URL without a trailing slash
      * @param batchRequestData the batch request payload data as a JSON string
      * @param batchResponseData the batch response body as a JSON string
+     * @param logger logger to use for telemetry
      */
-    protected MSBatchResponseContent(@Nonnull final String baseUrl, @Nonnull final JsonObject batchRequestData, @Nonnull final JsonObject batchResponseData) {
+    protected MSBatchResponseContent(@Nonnull final ILogger logger, @Nonnull final String baseUrl, @Nonnull final JsonObject batchRequestData, @Nonnull final JsonObject batchResponseData) {
+        this.logger = logger;
         this.protocol = Protocol.HTTP_1_1;
         this.message = "OK";
         final Map<String, Request> requestMap = createBatchRequestsHashMap(baseUrl, batchRequestData);
@@ -171,7 +187,7 @@ public void update(@Nonnull final Response batchResponse) {
                     updateFromResponseBody(stringToJSONObject(batchResponseData));
                 }
             } catch (final IOException e) {
-                e.printStackTrace();
+                logger.logError("error updating batch response content from response body", e);
             }
         }
     }
@@ -208,7 +224,7 @@ private Map<String, Request> createBatchRequestsHashMap(final Response batchResp
             final String baseUrl = batchResponse.request().url().toString().replace("$batch", "");
             return createBatchRequestsHashMap(baseUrl, requestJSONObject);
         } catch (IOException ex) {
-            ex.printStackTrace();
+            logger.logError("error parsing batch requests to get batch response content", ex);
             return null;
         }
     }
@@ -268,7 +284,7 @@ private Map<String, Request> createBatchRequestsHashMap(@Nonnull final String ba
             return batchRequestsHashMap;
 
         } catch (JsonParseException e) {
-            e.printStackTrace();
+            logger.logError("error parsing batch request", e);
         }
         return null;
     }
@@ -280,7 +296,7 @@ private JsonObject stringToJSONObject(final String input) {
                 JsonObject = JsonParser.parseString(input).getAsJsonObject();
             }
         } catch (final Exception e) {
-            e.printStackTrace();
+            logger.logError("error parsing input into JSONObject", e);
         }
         return JsonObject;
     }
diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index 6a1e88362..dbbec3cad 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -9,6 +9,8 @@
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
 import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
+import com.microsoft.graph.logger.DefaultLogger;
+import com.microsoft.graph.logger.ILogger;
 
 import okhttp3.Interceptor;
 import okhttp3.Request;
@@ -69,10 +71,22 @@ public class RetryHandler implements Interceptor{
      */
     private final long DELAY_MILLISECONDS = 1000;
 
+    private final ILogger logger;
+
     /**
      * @param retryOption Create Retry handler using retry option
      */
     public RetryHandler(@Nullable final RetryOptions retryOption) {
+        this(new DefaultLogger(), retryOption);
+    }
+    /**
+     * @param retryOption Create Retry handler using retry option
+     * @param logger logger to use for telemetry
+     */
+    public RetryHandler(@Nonnull final ILogger logger, @Nullable final RetryOptions retryOption) {
+        if(logger == null)
+            throw new IllegalArgumentException("logger parameter cannot be null");
+        this.logger = logger;
         this.mRetryOption = retryOption;
         if(this.mRetryOption == null) {
             this.mRetryOption = new RetryOptions();
@@ -111,7 +125,7 @@ && checkStatus(statusCode) && isBuffered(response, request)
             try {
                 Thread.sleep(retryInterval);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                logger.logError("error retrying the request", e);
             }
         }
         return shouldRetry;
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
index a14195156..96388f902 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
@@ -111,9 +111,12 @@ public String answer(InvocationOnMock invocation) throws Throwable {
         });
 
         assertThrows("the number of steps cannot exceed 20", IllegalArgumentException.class, () -> {
-            new MSBatchRequestContent(null, null, null, null, null, null, null, null, null, null, null, null, null,
+            new MSBatchRequestContent(mock(ILogger.class), null, null, null, null, null, null, null, null, null, null, null, null, null,
                     null, null, null, null, null, null, null, null, null);
         });
+        assertThrows("the logger cannot be null", IllegalArgumentException.class, () -> {
+            new MSBatchRequestContent((ILogger) null, (MSBatchRequestStep)null);
+        });
 
         new MSBatchRequestContent(mockStep, null); // addind a null step doesn't throw
         assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
@@ -188,7 +191,7 @@ public void executeBatchTest() throws Throwable {
     }
     @Test
     public void responseParsing() {
-        final MSBatchResponseContent batchResponse = new MSBatchResponseContent("https://graph.microsoft.com/v1.0",
+        final MSBatchResponseContent batchResponse = new MSBatchResponseContent(mock(ILogger.class), "https://graph.microsoft.com/v1.0",
                                                         JsonParser.parseString("{\"requests\":[{\"id\":\"1\",\"method\":\"GET\",\"url\":\"/me\"}]}")
                                                                     .getAsJsonObject(),
                                                         JsonParser.parseString("{\"responses\": [{\"id\": \"1\",\"status\": 200,\"body\": null}]}")
diff --git a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
index d9404c992..9a9c104cf 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
@@ -2,7 +2,9 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 import java.net.HttpURLConnection;
 
@@ -147,6 +149,12 @@ public void testGetRetryAfterMaxExceed() {
         long delay = retryHandler.getRetryAfter(TestResponse(), 190, 1);
         assertTrue(delay == 180000);
     }
+    @Test
+    public void defensiveProgramming() {
+        assertThrows("logger cannot be null", IllegalArgumentException.class, () -> {
+            new RetryHandler(null, mock(RetryOptions.class));
+        });
+    }
 
     Response TestResponse() {
         return new Response.Builder()

From 00fb75ae1593e98277f2a2bbdd0d53826180a64c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 25 Jan 2021 15:16:04 -0500
Subject: [PATCH 129/213] - removes reference to serializer and json in
 IJsonBackedObject interface to reduce memory footprint

---
 .../graph/http/BaseCollectionPage.java        | 33 -------------
 .../graph/http/BaseCollectionRequest.java     |  1 -
 .../graph/http/BaseCollectionResponse.java    | 48 +++----------------
 .../graph/http/DeltaCollectionPage.java       | 14 +++---
 .../graph/http/GraphErrorResponse.java        | 24 ++--------
 .../graph/http/ICollectionResponse.java       |  3 +-
 .../graph/http/ReferenceRequestBody.java      | 33 -------------
 .../graph/serializer/IJsonBackedObject.java   | 26 ++--------
 .../graph/http/BaseCollectionPageTests.java   |  7 ---
 .../graph/http/ReferenceRequestBodyTests.java |  4 --
 10 files changed, 23 insertions(+), 170 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
index 4512cad31..0411eab2d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
@@ -53,16 +53,6 @@ public class BaseCollectionPage<T, T2 extends BaseRequestBuilder<T>> implements
      */
     private final T2 requestBuilder;
 
-    /**
-     * The raw representation of this class
-     */
-    private JsonObject rawObject;
-
-    /**
-     * The serializer
-     */
-    private ISerializer serializer;
-
     /**
      * A collection page for WorkforceIntegration
      *
@@ -118,27 +108,6 @@ public List<T> getCurrentPage() {
         return pageContents;
     }
 
-    /**
-     * Gets the raw representation of this class
-     *
-     * @return the raw representation of this class
-     */
-    @Nullable
-    public JsonObject getRawObject() {
-        return rawObject;
-    }
-
-    /**
-     * Gets the serializer
-     *
-     * @return the serializer
-     */
-    @Override
-    @Nullable
-    public ISerializer getSerializer() {
-        return serializer;
-    }
-
     /**
      * Sets the raw JSON object
      *
@@ -146,8 +115,6 @@ public ISerializer getSerializer() {
      * @param json       the JSON object to set this object to
      */
     public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
-        this.serializer = serializer;
-        rawObject = json;
     }
 
     @Override
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 901301d3d..cb0a19f8c 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -130,7 +130,6 @@ public T3 buildFromResponse(@Nonnull final T2 response) {
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
                     .newInstance(response.nextLink(), getBaseRequest().getClient(), options);
             final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), builder.getClass()).newInstance(response, response.nextLink() == null ? null : builder);
-            page.setRawObject(response.getSerializer(), response.getRawObject());
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
             return null;
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
index a560d0ad9..b0f7a376a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
@@ -11,15 +11,14 @@
 import com.microsoft.graph.serializer.IJsonBackedObject;
 import com.microsoft.graph.serializer.ISerializer;
 import com.microsoft.graph.serializer.AdditionalDataManager;
-import com.microsoft.graph.http.ICollectionResponse;
 
 /**
  * The basic collection response implementation
- * 
+ *
  * @param <T> the entity or complex type
  */
-public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T>, IJsonBackedObject  {
-	
+public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T>  {
+
 	/**
      * The list of items within this collection page
      */
@@ -27,7 +26,7 @@ public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T
     @Expose
     @Nullable
 	public java.util.List<T> value;
-	
+
 
 	/**
      * The list of items within this collection page
@@ -43,7 +42,7 @@ public java.util.List<T> values() {
     @Expose(serialize = false)
     @Nullable
     public String nextLink;
-	
+
     @Override
     @Nullable
     public String nextLink() {
@@ -58,39 +57,6 @@ public final AdditionalDataManager additionalDataManager() {
         return additionalDataManager;
     }
 
-    /**
-     * The raw representation of this class
-     */
-    @Nullable
-    protected JsonObject rawObject;
-
-    /**
-     * The serializer
-     */
-    @Nullable
-	protected ISerializer serializer;
-	
-	/**
-     * Gets the raw representation of this class
-     *
-     * @return the raw representation of this class
-     */
-    @Nullable
-    public JsonObject getRawObject() {
-        return rawObject;
-    }
-
-    /**
-     * Gets serializer
-     *
-     * @return the serializer
-     */
-    @Override
-    @Nullable
-    public ISerializer getSerializer() {
-        return serializer;
-	}
-
 	/**
      * Sets the raw JSON object
      *
@@ -98,8 +64,6 @@ public ISerializer getSerializer() {
      * @param json the JSON object to set this object to
      */
     public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
-        this.serializer = serializer;
-        rawObject = json;
         if (json.has("value")) {
             final JsonArray array = json.getAsJsonArray("value");
             for (int i = 0; i < array.size(); i++) {
@@ -110,4 +74,4 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java b/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
index a88333d33..2964f7c6c 100644
--- a/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
+++ b/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.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
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.graph.serializer.AdditionalDataManager;
 import com.microsoft.graph.serializer.ISerializer;
@@ -39,7 +40,7 @@
  */
 public class DeltaCollectionPage<T, T2 extends BaseRequestBuilder<T>> extends BaseCollectionPage<T, T2> {
     /**
-     * The opaque link to query delta after the 
+     * The opaque link to query delta after the
      * initial request
      */
     @Nullable
@@ -53,8 +54,9 @@ public class DeltaCollectionPage<T, T2 extends BaseRequestBuilder<T>> extends Ba
      */
     public DeltaCollectionPage(@Nonnull final ICollectionResponse<T> response, @Nullable final T2 builder) {
        super(response.values(), builder, response.additionalDataManager());
-        if (response.getRawObject().get("@odata.deltaLink") != null) {
-            deltaLink = response.getRawObject().get("@odata.deltaLink").getAsString();
+       final JsonElement deltaLinkRaw = response.additionalDataManager().get("@odata.deltaLink");
+        if (deltaLinkRaw != null) {
+            deltaLink = deltaLinkRaw.getAsString();
         } else {
             deltaLink = null;
         }
diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
index c72db98f4..801bb00b8 100644
--- a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
+++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.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
@@ -66,22 +66,4 @@ public void setRawObject(@Nullable final ISerializer serializer, @Nonnull final
     public final AdditionalDataManager additionalDataManager() {
         return additionalDataManager;
     }
-
-    @Override
-    @Nullable
-    public ISerializer getSerializer() {
-        return null;
-    }
-
-    /**
-     * Gets the raw JSON object for this object as parsed from
-     * @return the JSON that this object was derived from
-     */
-    @Override
-    @Nullable
-    public JsonObject getRawObject() {
-        return rawObject;
-    }
 }
-
-
diff --git a/src/main/java/com/microsoft/graph/http/ICollectionResponse.java b/src/main/java/com/microsoft/graph/http/ICollectionResponse.java
index 6d7174e56..dd7743c66 100644
--- a/src/main/java/com/microsoft/graph/http/ICollectionResponse.java
+++ b/src/main/java/com/microsoft/graph/http/ICollectionResponse.java
@@ -5,14 +5,13 @@
 import javax.annotation.Nullable;
 
 import com.microsoft.graph.serializer.IJsonBackedObject;
-import com.microsoft.graph.serializer.ISerializer;
 
 /**
  * Represents a response of a collection of items returned by the service
  * @param <T> the type for the items in the response.
  */
 public interface ICollectionResponse<T> extends IJsonBackedObject{
-    /** 
+    /**
      * Gets the deserialized values the response contains
      * @return the deserialized values for the response
      */
diff --git a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
index 6046c65b7..828c17cdb 100644
--- a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
+++ b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
@@ -44,16 +44,6 @@ public class ReferenceRequestBody implements IJsonBackedObject {
     @Nonnull
     public String odataId;
 
-    /**
-     * The raw representation of this class
-     */
-    private JsonObject rawObject;
-
-    /**
-     * The serializer
-     */
-    private ISerializer serializer;
-
     /**
      * Instanciates a new reference request body from the serialized payload
      * @param payload payload to instanciate the body from
@@ -62,27 +52,6 @@ public ReferenceRequestBody(@Nonnull final String payload) {
         odataId = payload;
     }
 
-    /**
-     * Gets the raw representation of this class
-     *
-     * @return the raw representation of this class
-     */
-    @Nullable
-    public JsonObject getRawObject() {
-        return rawObject;
-    }
-
-    /**
-     * Gets serializer
-     *
-     * @return the serializer
-     */
-    @Nullable
-    @Override
-    public ISerializer getSerializer() {
-        return serializer;
-    }
-
     /**
      * Sets the raw JSON object
      *
@@ -90,8 +59,6 @@ public ISerializer getSerializer() {
      * @param json       the JSON object to set this object to
      */
     public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
-        this.serializer = serializer;
-        this.rawObject = json;
     }
 
     @Override
diff --git a/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java b/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java
index b413e1237..c1e78cc9c 100644
--- a/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.java
+++ b/src/main/java/com/microsoft/graph/serializer/IJsonBackedObject.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
@@ -41,27 +41,11 @@ public interface IJsonBackedObject {
     void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json);
 
     /**
-     * Provides access to objects not anticipated in the model, as well as 
+     * Provides access to objects not anticipated in the model, as well as
      * request and response data from the HTTP call
-     * 
+     *
      * @return the AddtionalDataManager
      */
     @Nullable
     AdditionalDataManager additionalDataManager();
-
-
-    /**
-     * Gets the raw JSON object for this object as parsed from
-     * @return the JSON that this object was derived from
-     */
-    @Nullable
-    JsonObject getRawObject();
-
-    /**
-     * Gets serializer
-     *
-     * @return the serializer
-     */
-    @Nullable
-    ISerializer getSerializer();
 }
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
index 919165060..eb06d03e5 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
@@ -4,7 +4,6 @@
 
 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 java.util.ArrayList;
@@ -64,13 +63,7 @@ public void testNextPage() {
     public void testRawObject() {
         ISerializer serializer = mock(ISerializer.class);
         JsonObject jsonObject = new JsonObject();
-        assertNull(baseCollectionPage.getRawObject());
-        assertNull(baseCollectionPage.getSerializer());
         baseCollectionPage.setRawObject(serializer,jsonObject);
-        assertNotNull(baseCollectionPage.getRawObject());
-        assertNotNull(baseCollectionPage.getSerializer());
-        assertEquals(serializer, baseCollectionPage.getSerializer());
-        assertEquals(jsonObject, baseCollectionPage.getRawObject());
     }
 
 }
diff --git a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
index 0b961685a..3cebd262a 100644
--- a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
+++ b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
@@ -1,7 +1,5 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;
@@ -17,8 +15,6 @@ public void testRawObject() {
         ISerializer serializer = mock(ISerializer.class);
         JsonObject jsonObject = new JsonObject();
         body.setRawObject(serializer,jsonObject);
-        assertEquals(serializer,body.getSerializer());
-        assertEquals(jsonObject,body.getRawObject());
     }
 
 }

From 5bf2db94434602db896033da86c73ced9f71484b Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 25 Jan 2021 15:54:28 -0500
Subject: [PATCH 130/213] - adds a unit test for delta link

---
 .../graph/http/DeltaCollectionPage.java       |  4 ----
 .../graph/http/DeltaCollectionPageTests.java  | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java

diff --git a/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java b/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
index 2964f7c6c..046cca2d4 100644
--- a/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
+++ b/src/main/java/com/microsoft/graph/http/DeltaCollectionPage.java
@@ -23,11 +23,7 @@
 package com.microsoft.graph.http;
 
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.microsoft.graph.serializer.AdditionalDataManager;
-import com.microsoft.graph.serializer.ISerializer;
 
-import java.util.Collections;
 import java.util.List;
 
 import javax.annotation.Nullable;
diff --git a/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
new file mode 100644
index 000000000..31eb7156d
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
@@ -0,0 +1,20 @@
+package com.microsoft.graph.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+
+import com.google.gson.JsonPrimitive;
+
+import org.junit.Test;
+
+public class DeltaCollectionPageTests {
+    @SuppressWarnings("unchecked")
+    @Test
+    public void pageContainsDeltaLink() {
+        final BaseRequestBuilder<String> mRequestBuilder = mock(BaseRequestBuilder.class);
+        final BaseCollectionResponse<String> mResponse = new BaseCollectionResponse<String>() {};
+        mResponse.additionalDataManager().put("@odata.deltaLink", new JsonPrimitive("https://somedeltalink"));
+        final DeltaCollectionPage<String, BaseRequestBuilder<String>> tPage = new DeltaCollectionPage<>(mResponse, mRequestBuilder);
+        assertEquals("https://somedeltalink", tPage.deltaLink);
+    }
+}

From 3e87c20def32fd9f3a31a25edec52a5ce2df462e Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 10:16:25 +0100
Subject: [PATCH 131/213] Use InputStream instead of String in ISerializer

---
 .gitignore                                    |  4 ++
 gradlew                                       |  0
 .../ChunkedUploadResponseHandler.java         | 51 ++++++++++---------
 .../graph/http/CoreHttpProvider.java          | 11 +++-
 .../graph/http/GraphServiceException.java     | 13 ++++-
 .../serializer/CollectionPageSerializer.java  | 12 ++---
 .../graph/serializer/DefaultSerializer.java   | 27 ++++++----
 .../graph/serializer/ISerializer.java         |  9 ++--
 .../graph/core/GraphServiceClientTest.java    |  9 ++--
 .../graph/http/CoreHttpProviderTests.java     |  2 +-
 10 files changed, 87 insertions(+), 51 deletions(-)
 mode change 100644 => 100755 gradlew

diff --git a/.gitignore b/.gitignore
index e34a1d606..26e2d94d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,10 @@ hs_err_pid*
 .classpath
 .settings
 
+# IntelliJ
+*.iml
+.idea/
+
 # Maven
 /target/
 local.properties
\ No newline at end of file
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index a0787b561..014c622a2 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -22,17 +22,9 @@
 
 package com.microsoft.graph.concurrency;
 
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.http.GraphServiceException;
-import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.http.HttpResponseCode;
 import com.microsoft.graph.http.HttpResponseHeadersHelper;
 import com.microsoft.graph.http.IHttpRequest;
@@ -40,8 +32,18 @@
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
 
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import okhttp3.Response;
 
+import static com.microsoft.graph.http.HttpResponseCode.HTTP_CREATED;
+import static com.microsoft.graph.http.HttpResponseCode.HTTP_OK;
+
 /**
  * Handles the stateful response from the OneDrive upload session
  *
@@ -98,35 +100,38 @@ public ChunkedUploadResult<UploadType> generateResult(
 		if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
 			logger.logDebug("Receiving error during upload, see detail on result error");
 
-			return new ChunkedUploadResult<UploadType>(
+			return new ChunkedUploadResult<>(
 					GraphServiceException.createFromResponse(request, null, serializer,
-						response, logger));
-		} else if (response.code() >= HttpResponseCode.HTTP_OK
+							response, logger));
+		} else if (response.code() >= HTTP_OK
 				&& response.code() < HttpResponseCode.HTTP_MULTIPLE_CHOICES) {
 			final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
 			final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
 			final String location = headers.get("Location");
-			if(contentType != null
-				&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
+			if (contentType != null
+					&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
 				try (final InputStream in = new BufferedInputStream(response.body().byteStream())) {
-					final String rawJson = CoreHttpProvider.streamToString(in);
-					final IUploadSession session = serializer.deserializeObject(rawJson, uploadSessionClass);
-					if(session == null || session.getNextExpectedRanges() == null) {
+					if (isUploadSessionCompleted(response)) {
 						logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
-						final UploadType uploadedItem = serializer.deserializeObject(rawJson, this.deserializeTypeClass);
-						return new ChunkedUploadResult<UploadType>(uploadedItem);
+						final UploadType uploadedItem = serializer.deserializeObject(in, this.deserializeTypeClass);
+						return new ChunkedUploadResult<>(uploadedItem);
 					} else {
+						final IUploadSession session = serializer.deserializeObject(in, uploadSessionClass);
 						logger.logDebug("Chunk bytes has been accepted by the server.");
-						return new ChunkedUploadResult<UploadType>(session);
+						return new ChunkedUploadResult<>(session);
 					}
 				}
-			} else if(location != null) {
+			} else if (location != null) {
 				logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
-				return new ChunkedUploadResult<UploadType>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
+				return new ChunkedUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
 			} else {
 				logger.logDebug("Upload session returned an unexpected response");
 			}
 		}
-		return new ChunkedUploadResult<UploadType>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
+		return new ChunkedUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
+	}
+
+	private boolean isUploadSessionCompleted(Response response) {
+		return response.code() == HTTP_OK || response.code() == HTTP_CREATED;
 	}
 }
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index bf68be52f..dd7bbd1ef 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -62,8 +62,11 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import okhttp3.internal.Util;
 import okio.BufferedSink;
 
+import static okhttp3.internal.Util.closeQuietly;
+
 /**
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
  */
@@ -502,8 +505,12 @@ private <Result> Result handleJsonResponse(final InputStream in, Map<String, Lis
 			return null;
 		}
 
-		final String rawJson = CoreHttpProvider.streamToString(in);
-		return serializer.deserializeObject(rawJson, clazz, responseHeaders);
+		try {
+			return serializer.deserializeObject(in, clazz, responseHeaders);
+		} finally {
+			closeQuietly(in);
+		}
+
     }
     /**
 	 * Handles the cause where the response is a Text object
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index 330d69885..fbe1016d1 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -22,8 +22,10 @@
 
 package com.microsoft.graph.http;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -42,6 +44,8 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 import okhttp3.Response;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static okhttp3.internal.Util.closeQuietly;
 
 /**
@@ -377,7 +381,7 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
         }
 
         final String responseMessage = response.message();
-        String rawOutput = "{}";
+        String rawOutput;
 
         InputStream is = response.body().byteStream();
         try {
@@ -387,7 +391,12 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
         }
         GraphErrorResponse error;
         try {
-            error = serializer.deserializeObject(rawOutput, GraphErrorResponse.class, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response));
+            // we need a "copy" of the stream, so we can log the raw output if it cannot be parsed
+            error = serializer.deserializeObject(
+                    new ByteArrayInputStream(rawOutput.getBytes(UTF_8)),
+                    GraphErrorResponse.class,
+                    responseHeadersHelper.getResponseHeadersAsMapOfStringList(response)
+            );
         } catch (final Exception ex) {
             error = new GraphErrorResponse();
             error.error = new GraphError();
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index dbd598cf5..8688e1191 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -106,7 +106,7 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
 		}
 		serializer = new DefaultSerializer(logger);
 		final JsonArray sourceArray = json.getAsJsonArray();
-		final ArrayList<T1> list = new ArrayList<T1>(sourceArray.size());
+		final ArrayList<T1> list = new ArrayList<>(sourceArray.size());
 		/** eg: com.microsoft.graph.requests.AttachmentCollectionPage */
 		final String collectionPageClassCanonicalName = ((Class<?>)typeOfT).getName();
 		/** eg: com.microsoft.graph.models.Attachment */
@@ -115,14 +115,14 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
 					.replace("requests", "models");
 		try {
 			final Class<?> baseEntityClass = Class.forName(baseEntityClassCanonicalName);
-			for(JsonElement sourceElement : sourceArray) {
-				if(sourceElement.isJsonObject()) {
+			for (JsonElement sourceElement : sourceArray) {
+				if (sourceElement.isJsonObject()) {
 					final JsonObject sourceObject = sourceElement.getAsJsonObject();
 					Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
-					if(entityClass == null)
+					if (entityClass == null)
 						entityClass = baseEntityClass;
-					final T1 targetObject = (T1)serializer.deserializeObject(sourceObject.toString(), entityClass);
-					((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
+					final T1 targetObject = (T1) serializer.deserializeObject(sourceObject, entityClass, null);
+					((IJsonBackedObject) targetObject).setRawObject(serializer, sourceObject);
 					list.add(targetObject);
 				}
 			}
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 7cc7e3c39..9f1ef1577 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -28,8 +28,11 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+
 import com.microsoft.graph.logger.ILogger;
 
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -38,8 +41,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * The default serializer implementation for the SDK
@@ -69,35 +72,41 @@ public DefaultSerializer(@Nonnull final ILogger logger) {
 	/**
 	 * Deserializes an object from the input string
 	 *
-	 * @param inputString the string that stores the representation of the item
+	 * @param inputStream the string that stores the representation of the item
 	 * @param clazz	   the class of the item to be deserialized
 	 * @param <T>		 the type of the item to be deserialized
 	 * @return			the deserialized item from the input string
 	 */
 	@Override
 	@Nullable
-	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
-		return deserializeObject(inputString, clazz, null);
+	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz) {
+		return deserializeObject(inputStream, clazz, null);
 	}
 	private static final String graphResponseHeadersKey = "graphResponseHeaders";
 	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
-	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, java.util.List<String>> responseHeaders) {
-		final T jsonObject = gson.fromJson(inputString, clazz);
+	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
+		final JsonElement rawElement = gson.fromJson(new InputStreamReader(inputStream), JsonElement.class);
+		return deserializeObject(rawElement, clazz, responseHeaders);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Nullable
+	public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
+		final T jsonObject = gson.fromJson(rawElement, clazz);
 
 		// Populate the JSON-backed fields for any annotations that are not in the object model
 		if (jsonObject instanceof IJsonBackedObject) {
 			logger.logDebug("Deserializing type " + clazz.getSimpleName());
-			final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
 			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 = this.getDerivedClass(rawObject, clazz);
-				if(derivedClass != null)
-					jo = (T) gson.fromJson(inputString, derivedClass);
+				if (derivedClass != null)
+					jo = (T) gson.fromJson(rawElement, derivedClass);
 			}
 
 			final IJsonBackedObject jsonBackedObject = (IJsonBackedObject) jo;
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 31e3d418f..02bae50fb 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.serializer;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -36,25 +37,25 @@ public interface ISerializer {
     /**
      * Deserialize an object from the input string
      * 
-     * @param inputString the string that stores the representation of the item
+     * @param inputStream the string that stores the representation of the item
      * @param clazz       the .class of the item to be deserialized
      * @param <T>         the type of the item to be deserialized
      * @return            the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz);
+    <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz);
     
     /**
      * Deserialize an object from the input string
      * 
-     * @param inputString     the string that stores the representation of the item
+     * @param inputStream     the string that stores the representation of the item
      * @param clazz           the .class of the item to be deserialized
      * @param responseHeaders the HTTP response headers
      * @param <T>             the type of the item to be deserialized
      * @return                the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
+    <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
 
     /**
      * Serializes an object into a string
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index 3134c3c96..adaa53db1 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -4,6 +4,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
 
+import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
@@ -73,13 +74,13 @@ public <T> String serializeObject(T serializableObject) {
             }
 
             @Override
-            public <T> T deserializeObject(String inputString, Class<T> clazz,
-                    Map<String, List<String>> responseHeaders) {
+            public <T> T deserializeObject(InputStream inputStream, Class<T> clazz,
+                                           Map<String, List<String>> responseHeaders) {
                 return null;
             }
 
             @Override
-            public <T> T deserializeObject(String inputString, Class<T> clazz) {
+            public <T> T deserializeObject(InputStream inputString, Class<T> clazz) {
                 return null;
             }
         };
@@ -90,7 +91,7 @@ public <T> T deserializeObject(String inputString, Class<T> clazz) {
         assertEquals(serializer, client.getSerializer());
         assertNotNull(client.getHttpProvider());
         assertNotNull(client.getLogger());
-        assertEquals(serializer, ((CoreHttpProvider) client.getHttpProvider()).getSerializer());
+        assertEquals(serializer, client.getHttpProvider().getSerializer());
     }
 
     @Test
diff --git a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
index f829e2936..a025b720a 100644
--- a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
+++ b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
@@ -84,7 +84,7 @@ public void testVerboseErrorResponse() throws Exception {
         final ILogger logger = mock(ILogger.class);
         when(logger.getLoggingLevel()).thenReturn(LoggerLevel.DEBUG);
         final ISerializer serializer = mock(ISerializer.class);
-        when(serializer.deserializeObject(anyString(), any())).thenReturn(toSerialize);
+        when(serializer.deserializeObject(any(), any())).thenReturn(toSerialize);
 
         mProvider = new CoreHttpProvider(serializer,
                 logger,

From 549d71ee21398e5ae8e2b3019f164b3744c28bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Haris=20Osmanagi=C4=87?=
 <57673206+hosmanagic-axcient@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:35:57 +0100
Subject: [PATCH 132/213] Update
 src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java

Co-authored-by: Vincent Biret <vincentbiret@hotmail.com>
---
 .../java/com/microsoft/graph/serializer/DefaultSerializer.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 9f1ef1577..24e368f0c 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -83,7 +83,6 @@ public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
 		return deserializeObject(inputStream, clazz, null);
 	}
 	private static final String graphResponseHeadersKey = "graphResponseHeaders";
-	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {

From 40636543fe0ac9aa2ae97499e305e96403073a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Haris=20Osmanagi=C4=87?=
 <57673206+hosmanagic-axcient@users.noreply.github.com>
Date: Tue, 26 Jan 2021 15:36:13 +0100
Subject: [PATCH 133/213] Update
 src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java

Co-authored-by: Vincent Biret <vincentbiret@hotmail.com>
---
 .../microsoft/graph/serializer/CollectionPageSerializer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index 8688e1191..3c8ca8108 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -121,7 +121,7 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
 					Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
 					if (entityClass == null)
 						entityClass = baseEntityClass;
-					final T1 targetObject = (T1) serializer.deserializeObject(sourceObject, entityClass, null);
+					final T1 targetObject = (T1) serializer.deserializeObject(sourceObject, entityClass);
 					((IJsonBackedObject) targetObject).setRawObject(serializer, sourceObject);
 					list.add(targetObject);
 				}

From 3cd16f088a0b111731829a9a0d0ac94fcfdb8fda Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 26 Jan 2021 09:59:16 -0500
Subject: [PATCH 134/213] - replaces manual null defensive programming by
 facilitating method

---
 .../TokenCredentialAuthProvider.java             | 10 +++-------
 .../graph/content/MSBatchRequestContent.java     | 16 +++++-----------
 .../graph/content/MSBatchRequestStep.java        | 10 ++++------
 .../graph/content/MSBatchResponseContent.java    | 10 +++-------
 .../com/microsoft/graph/core/BaseClient.java     |  7 ++++---
 .../microsoft/graph/httpcore/RetryHandler.java   |  5 ++---
 .../java/com/microsoft/graph/options/Option.java |  7 +++++--
 .../TokenCredentialAuthProviderTest.java         |  4 ++--
 .../graph/content/MSBatchRequestContentTest.java |  6 +++---
 .../graph/content/MSBatchRequestStepTest.java    |  4 ++--
 .../content/MSBatchResponseContentTest.java      |  4 ++--
 .../graph/httpcore/RetryHandlerTest.java         |  2 +-
 .../com/microsoft/graph/options/OptionTests.java | 15 +++++----------
 13 files changed, 41 insertions(+), 59 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
index c77e823e0..56e28a443 100644
--- a/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
+++ b/src/main/java/com/microsoft/graph/authentication/TokenCredentialAuthProvider.java
@@ -6,6 +6,7 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 import javax.annotation.Nonnull;
@@ -36,15 +37,12 @@ public TokenCredentialAuthProvider(@Nonnull final TokenCredential tokenCredentia
      * @param scopes Specified desired scopes of the Auth Provider
      */
     public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull final TokenCredential tokenCredential) {
-        if(tokenCredential == null) {
-            throw new IllegalArgumentException("tokenCredential parameter cannot be null.");
-        }
         if(scopes == null || scopes.isEmpty()) {
             throw new IllegalArgumentException("scopes parameter cannot be null or empty");
         }
         this.context = new TokenRequestContext();
         this.context.setScopes(scopes);
-        this.tokenCredential = tokenCredential;
+        this.tokenCredential = Objects.requireNonNull(tokenCredential, "tokenCredential parameter cannot be null.");
     }
 
     /**
@@ -54,9 +52,7 @@ public TokenCredentialAuthProvider(@Nonnull final List<String> scopes, @Nonnull
      */
     @Nonnull
     public CompletableFuture<String> getAuthorizationTokenAsync(@Nonnull final URL requestUrl) {
-        if(requestUrl == null)
-            throw new IllegalArgumentException("requestUrl parameter cannot be null");
-        else if(shouldAuthenticateRequestWithUrl(requestUrl))
+        if(shouldAuthenticateRequestWithUrl(Objects.requireNonNull(requestUrl, "requestUrl parameter cannot be null")))
             return this.tokenCredential
                         .getToken(this.context)
                         .toFuture()
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
index a8e49ec64..013f47509 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
@@ -5,6 +5,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Matcher;
@@ -60,10 +61,7 @@ public MSBatchRequestContent(@Nonnull final ILogger logger, @Nonnull final MSBat
         if (batchRequestStepsArray.length > MAX_NUMBER_OF_REQUESTS)
             throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
 
-        if(logger == null)
-            throw new IllegalArgumentException("logger cannot be null");
-
-        this.logger = logger;
+        this.logger = Objects.requireNonNull(logger, "logger cannot be null");
 
         this.batchRequestStepsHashMap = new LinkedHashMap<>();
         for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
@@ -78,8 +76,7 @@ public MSBatchRequestContent(@Nonnull final ILogger logger, @Nonnull final MSBat
      * given
      */
     public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchRequestStep) {
-        if(batchRequestStep == null)
-            throw new IllegalArgumentException("batchRequestStep parameter cannot be null");
+        Objects.requireNonNull(batchRequestStep, "batchRequestStep parameter cannot be null");
         if (batchRequestStepsHashMap.containsKey(batchRequestStep.getRequestId()) ||
             batchRequestStepsHashMap.size() >= MAX_NUMBER_OF_REQUESTS)
             return false;
@@ -95,8 +92,7 @@ public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchReques
      */
     @Nonnull
     public String addBatchRequestStep(@Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
-        if(request == null)
-            throw new IllegalArgumentException("request parameter cannot be null");
+        Objects.requireNonNull(request, "request parameter cannot be null");
         String requestId;
         do {
             requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
@@ -168,9 +164,7 @@ public MSBatchResponseContent execute(@Nonnull final IBaseClient client) {
      */
     @Nonnull
     public CompletableFuture<MSBatchResponseContent> executeAsync(@Nonnull final IBaseClient client) {
-        if(client == null) {
-            throw new IllegalArgumentException("client parameter cannot be null");
-        }
+        Objects.requireNonNull(client, "client parameter cannot be null");
         final JsonObject content = getBatchRequestContentAsJson();
         return client.customRequest("/$batch")
             .buildRequest()
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
index c023cc0ad..edb36b9d7 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -23,15 +24,12 @@ public class MSBatchRequestStep {
      * @param arrayOfDependsOnIds the ids of steps this step depends on
      */
     public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
-        if(requestId == null)
-            throw new IllegalArgumentException("Request Id cannot be null.");
-        if(requestId.length() == 0)
+        Objects.requireNonNull(requestId, "Request Id cannot be null.");
+        if(requestId.isEmpty())
             throw new IllegalArgumentException("Request Id cannot be empty.");
-        if(request == null)
-            throw new IllegalArgumentException("Request cannot be null.");
 
         this.requestId = requestId;
-        this.request = request;
+        this.request = Objects.requireNonNull(request, "Request cannot be null.");
         this.dependsOnIds = new HashSet<>(Arrays.asList(arrayOfDependsOnIds));
     }
 
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
index 739463434..9bdb8d242 100644
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
@@ -4,6 +4,7 @@
 import java.util.LinkedHashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -48,9 +49,7 @@ public MSBatchResponseContent(@Nullable final Response batchResponse) {
      * @param logger logger to use for telemetry
      */
     public MSBatchResponseContent(@Nonnull final ILogger logger, @Nullable final Response batchResponse) {
-        if(logger == null)
-            throw new IllegalArgumentException("logger parameter cannot be null");
-        this.logger = logger;
+        this.logger = Objects.requireNonNull(logger, "logger parameter cannot be null");
         update(batchResponse);
         this.message = batchResponse.message();
         this.protocol = batchResponse.protocol();
@@ -173,10 +172,7 @@ public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
      * @param batchResponse the response from the service.
      */
     public void update(@Nonnull final Response batchResponse) {
-        if (batchResponse == null)
-            throw new IllegalArgumentException("Batch Response cannot be null");
-
-        final Map<String, Request> requestMap = createBatchRequestsHashMap(batchResponse);
+        final Map<String, Request> requestMap = createBatchRequestsHashMap(Objects.requireNonNull(batchResponse, "Batch Response cannot be null"));
         if (requestMap != null)
             batchRequestsHashMap.putAll(requestMap);
 
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 186bd1a0f..bcf49d951 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -33,6 +33,9 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 import okhttp3.OkHttpClient;
@@ -236,9 +239,7 @@ public Builder<httpClientType> authenticationProvider(@Nonnull final IAuthentica
 		 */
 		@Nonnull
 		protected <ClientType extends BaseClient> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
-            if(instance == null) {
-                throw new IllegalArgumentException("The instance cannot be null");
-            }
+            Objects.requireNonNull(instance, "The instance cannot be null");
 			instance.setHttpProvider(this.getHttpProvider());
 			instance.setLogger(this.getLogger());
 			instance.setSerializer(this.getSerializer());
diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index dbbec3cad..195bf1d5b 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -1,6 +1,7 @@
 package com.microsoft.graph.httpcore;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -84,9 +85,7 @@ public RetryHandler(@Nullable final RetryOptions retryOption) {
      * @param logger logger to use for telemetry
      */
     public RetryHandler(@Nonnull final ILogger logger, @Nullable final RetryOptions retryOption) {
-        if(logger == null)
-            throw new IllegalArgumentException("logger parameter cannot be null");
-        this.logger = logger;
+        this.logger = Objects.requireNonNull(logger, "logger parameter cannot be null");
         this.mRetryOption = retryOption;
         if(this.mRetryOption == null) {
             this.mRetryOption = new RetryOptions();
diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
index c0f7a7c30..5def6285f 100644
--- a/src/main/java/com/microsoft/graph/options/Option.java
+++ b/src/main/java/com/microsoft/graph/options/Option.java
@@ -22,6 +22,8 @@
 
 package com.microsoft.graph.options;
 
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -46,8 +48,9 @@ public class Option {
      * @param value the value of the option
      */
     protected Option(@Nonnull final String name, @Nonnull final Object value) {
-        if(name == null || name == "") {
-            throw new IllegalArgumentException("name should not be null or empty");
+        Objects.requireNonNull(name, "name should not be null");
+        if(name.isEmpty()) {
+            throw new IllegalArgumentException("name should not empty");
         }
         this.name = name;
         this.value = value;
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 5522ff128..8a0bfcd0f 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -47,10 +47,10 @@ public void providerDoesntAddTokenOnInvalidHostName() throws MalformedURLExcepti
     }
     @Test
     public void providerDefensiveProgramming() {
-        assertThrows("should throw on null credentials", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null); });
+        assertThrows("should throw on null credentials", NullPointerException.class, () -> { new TokenCredentialAuthProvider(null); });
         assertThrows("should throw on null scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null, mock(TokenCredential.class)); });
         assertThrows("should throw on empty scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(new ArrayList<String>(), mock(TokenCredential.class)); });
         final TokenCredentialAuthProvider provider = new TokenCredentialAuthProvider(mock(TokenCredential.class));
-        assertThrows("should throw on null url", IllegalArgumentException.class, () -> { provider.getAuthorizationTokenAsync(null); });
+        assertThrows("should throw on null url", NullPointerException.class, () -> { provider.getAuthorizationTokenAsync(null); });
     }
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
index 96388f902..bcb71d02b 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
@@ -114,15 +114,15 @@ public String answer(InvocationOnMock invocation) throws Throwable {
             new MSBatchRequestContent(mock(ILogger.class), null, null, null, null, null, null, null, null, null, null, null, null, null,
                     null, null, null, null, null, null, null, null, null);
         });
-        assertThrows("the logger cannot be null", IllegalArgumentException.class, () -> {
+        assertThrows("the logger cannot be null", NullPointerException.class, () -> {
             new MSBatchRequestContent((ILogger) null, (MSBatchRequestStep)null);
         });
 
         new MSBatchRequestContent(mockStep, null); // addind a null step doesn't throw
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        assertThrows("should throw argument exception", NullPointerException.class, () -> {
             new MSBatchRequestContent().addBatchRequestStep(null);
         });
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        assertThrows("should throw argument exception", NullPointerException.class, () -> {
             new MSBatchRequestContent().addBatchRequestStep((Request) null);
         });
 
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
index 37f55024b..259110b08 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
@@ -22,10 +22,10 @@ public void testMSBatchRequestStepCreation() {
 
     @Test
     public void defensiveProgrammingTests() {
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        assertThrows("should throw argument exception", NullPointerException.class, () -> {
             new MSBatchRequestStep(null, null);
         });
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        assertThrows("should throw argument exception", NullPointerException.class, () -> {
             new MSBatchRequestStep("id", null);
         });
         assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
index 5e28699d1..c0ba80fae 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
@@ -20,7 +20,7 @@ public class MSBatchResponseContentTest {
 
     @Test
     public void testNullMSBatchResponseContent() {
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        assertThrows("should throw argument exception", NullPointerException.class, () -> {
             new MSBatchResponseContent((Response)null);
         });
     }
@@ -45,7 +45,7 @@ public void testInvalidMSBatchResponseContentWithEmptyResponse() {
 
     @Test
     public void testInvalidMSBatchResponseContentWithNullResponseString() {
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        assertThrows("should throw argument exception", NullPointerException.class, () -> {
             new MSBatchResponseContent(null);
         });
     }
diff --git a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
index 9a9c104cf..3a95e98e2 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
@@ -151,7 +151,7 @@ public void testGetRetryAfterMaxExceed() {
     }
     @Test
     public void defensiveProgramming() {
-        assertThrows("logger cannot be null", IllegalArgumentException.class, () -> {
+        assertThrows("logger cannot be null", NullPointerException.class, () -> {
             new RetryHandler(null, mock(RetryOptions.class));
         });
     }
diff --git a/src/test/java/com/microsoft/graph/options/OptionTests.java b/src/test/java/com/microsoft/graph/options/OptionTests.java
index 101a942f3..a83312a77 100644
--- a/src/test/java/com/microsoft/graph/options/OptionTests.java
+++ b/src/test/java/com/microsoft/graph/options/OptionTests.java
@@ -1,6 +1,7 @@
 package com.microsoft.graph.options;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -26,18 +27,12 @@ public void testOption() {
         assertEquals("o1",option.getName());
         assertEquals("ov1",option.getValue());
 
-        try {
+        assertThrows("should fail on null name", NullPointerException.class, () -> {
             new Option(null, "onion");
-            fail("should fail on null name");
-        } catch(Exception ex) {
-            assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
-        }
-        try {
+        });
+        assertThrows("should fail on empty name", IllegalArgumentException.class, () -> {
             new Option("", "onion");
-            fail("should fail on empty name");
-        } catch(Exception ex) {
-            assertTrue("exception is IllegalArgument", ex.getClass() == IllegalArgumentException.class);
-        }
+        });
     }
 
 }

From 55880ddb49ec031a0ab7a865c4fcfbe1ef012702 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 17:00:27 +0100
Subject: [PATCH 135/213] Revert "Update
 src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java"

This reverts commit 40636543fe0ac9aa2ae97499e305e96403073a6f.
---
 .../microsoft/graph/serializer/CollectionPageSerializer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index 3c8ca8108..8688e1191 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -121,7 +121,7 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2>
 					Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
 					if (entityClass == null)
 						entityClass = baseEntityClass;
-					final T1 targetObject = (T1) serializer.deserializeObject(sourceObject, entityClass);
+					final T1 targetObject = (T1) serializer.deserializeObject(sourceObject, entityClass, null);
 					((IJsonBackedObject) targetObject).setRawObject(serializer, sourceObject);
 					list.add(targetObject);
 				}

From 8960b3228f7e479f1c1bf2bc19642a3c4596af40 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 17:00:40 +0100
Subject: [PATCH 136/213] Revert "Update
 src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java"

This reverts commit 549d71ee21398e5ae8e2b3019f164b3744c28bf2.
---
 .../java/com/microsoft/graph/serializer/DefaultSerializer.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 24e368f0c..9f1ef1577 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -83,6 +83,7 @@ public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
 		return deserializeObject(inputStream, clazz, null);
 	}
 	private static final String graphResponseHeadersKey = "graphResponseHeaders";
+	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {

From e7a140689c522e795a2e8f473fd38d00bb2716ad Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 17:03:52 +0100
Subject: [PATCH 137/213] revert change in ChunkedUploadResponseHandler

---
 .../graph/concurrency/ChunkedUploadResponseHandler.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index 014c622a2..e42a93350 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -24,6 +24,7 @@
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.Constants;
+import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.GraphServiceException;
 import com.microsoft.graph.http.HttpResponseCode;
 import com.microsoft.graph.http.HttpResponseHeadersHelper;
@@ -111,12 +112,14 @@ public ChunkedUploadResult<UploadType> generateResult(
 			if (contentType != null
 					&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
 				try (final InputStream in = new BufferedInputStream(response.body().byteStream())) {
-					if (isUploadSessionCompleted(response)) {
+					final String rawJson = CoreHttpProvider.streamToString(in);
+					final IUploadSession session = serializer.deserializeObject(rawJson, uploadSessionClass);
+
+					if (session == null || session.getNextExpectedRanges() == null) {
 						logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
 						final UploadType uploadedItem = serializer.deserializeObject(in, this.deserializeTypeClass);
 						return new ChunkedUploadResult<>(uploadedItem);
 					} else {
-						final IUploadSession session = serializer.deserializeObject(in, uploadSessionClass);
 						logger.logDebug("Chunk bytes has been accepted by the server.");
 						return new ChunkedUploadResult<>(session);
 					}

From 9346585dd7372ef5f7ab7c7d16fa58b31ba9d373 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 17:12:01 +0100
Subject: [PATCH 138/213] minor updates

---
 .../graph/serializer/ISerializer.java         | 15 +++++-
 .../graph/http/CoreHttpProviderTests.java     | 48 +++++++++----------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 02bae50fb..865f512a2 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -37,8 +37,19 @@ public interface ISerializer {
     /**
      * Deserialize an object from the input string
      * 
-     * @param inputStream the string that stores the representation of the item
-     * @param clazz       the .class of the item to be deserialized
+     * @param inputString the string that stores the representation of the item
+     * @param clazz       the {@code Class} of the item to be deserialized
+     * @param <T>         the type of the item to be deserialized
+     * @return            the deserialized item from the input string
+     */
+    @Nullable
+    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz);
+
+    /**
+     * Deserialize an object from the input string
+     *
+     * @param inputStream the stream that stores the representation of the item
+     * @param clazz       the {@code Class} of the item to be deserialized
      * @param <T>         the type of the item to be deserialized
      * @return            the deserialized item from the input string
      */
diff --git a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
index a025b720a..40467a652 100644
--- a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
+++ b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
@@ -1,9 +1,20 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
+import com.microsoft.graph.core.GraphErrorCodes;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.DefaultSerializer;
+import com.microsoft.graph.serializer.ISerializer;
+
+import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -12,17 +23,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.junit.Test;
-
 import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -31,14 +31,14 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import com.microsoft.graph.core.GraphErrorCodes;
-import com.microsoft.graph.logger.ILogger;
-import com.microsoft.graph.logger.LoggerLevel;
-import com.microsoft.graph.options.HeaderOption;
-import com.microsoft.graph.serializer.DefaultSerializer;
-import com.microsoft.graph.serializer.ISerializer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class CoreHttpProviderTests {
 
@@ -84,7 +84,7 @@ public void testVerboseErrorResponse() throws Exception {
         final ILogger logger = mock(ILogger.class);
         when(logger.getLoggingLevel()).thenReturn(LoggerLevel.DEBUG);
         final ISerializer serializer = mock(ISerializer.class);
-        when(serializer.deserializeObject(any(), any())).thenReturn(toSerialize);
+        when(serializer.deserializeObject(anyString(), any())).thenReturn(toSerialize);
 
         mProvider = new CoreHttpProvider(serializer,
                 logger,

From 49bdbb5bdd54eb380739724c0680bf24282fb4f1 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 17:33:21 +0100
Subject: [PATCH 139/213] Add ISerializer.deserializeObject(jsonElement). Add
 Util.closeQuietly

---
 src/main/java/com/microsoft/graph/Util.java   | 19 ++++++++
 .../graph/http/CoreHttpProvider.java          | 35 +++++---------
 .../graph/serializer/DefaultSerializer.java   | 27 +++++++++--
 .../graph/serializer/ISerializer.java         | 19 +++++++-
 .../graph/core/GraphServiceClientTest.java    | 16 +++++++
 .../http/BaseCollectionRequestTests.java      | 48 ++++++++-----------
 6 files changed, 109 insertions(+), 55 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/Util.java

diff --git a/src/main/java/com/microsoft/graph/Util.java b/src/main/java/com/microsoft/graph/Util.java
new file mode 100644
index 000000000..b7c3e7c91
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/Util.java
@@ -0,0 +1,19 @@
+package com.microsoft.graph;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+public final class Util {
+    private Util() {}
+
+    public static void closeQuietly(Closeable closeable) {
+        if (closeable == null) {
+            return;
+        }
+        try {
+            closeable.close();
+        } catch (Exception e) {
+            // we don't care much
+        }
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index dd7bbd1ef..8fd99e619 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -22,6 +22,17 @@
 
 package com.microsoft.graph.http;
 
+import com.google.common.annotations.VisibleForTesting;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.Constants;
+import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
+import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.ISerializer;
+
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
@@ -30,42 +41,22 @@
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Scanner;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.Constants;
-import com.microsoft.graph.httpcore.HttpClients;
-import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
-import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
-import com.microsoft.graph.logger.ILogger;
-import com.microsoft.graph.logger.LoggerLevel;
-import com.microsoft.graph.options.HeaderOption;
-import com.microsoft.graph.serializer.ISerializer;
-
-import okhttp3.Headers;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.internal.Util;
 import okio.BufferedSink;
 
-import static okhttp3.internal.Util.closeQuietly;
+import static com.microsoft.graph.Util.closeQuietly;
 
 /**
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 9f1ef1577..cf10a4091 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -44,10 +44,14 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import static com.microsoft.graph.Util.closeQuietly;
+import static java.util.Collections.emptyMap;
+
 /**
  * The default serializer implementation for the SDK
  */
 public class DefaultSerializer implements ISerializer {
+	private static final String graphResponseHeadersKey = "graphResponseHeaders";
 
 	/**
 	 * The instance of the internal serializer
@@ -80,18 +84,33 @@ public DefaultSerializer(@Nonnull final ILogger logger) {
 	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz) {
-		return deserializeObject(inputStream, clazz, null);
+		return deserializeObject(inputStream, clazz, emptyMap());
 	}
-	private static final String graphResponseHeadersKey = "graphResponseHeaders";
+
+	@SuppressWarnings("unchecked")
+	@Override
+	@Nullable
+	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
+		final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
+		return deserializeObject(rawElement, clazz, emptyMap());
+	}
+
 	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
-		final JsonElement rawElement = gson.fromJson(new InputStreamReader(inputStream), JsonElement.class);
-		return deserializeObject(rawElement, clazz, responseHeaders);
+		InputStreamReader streamReader = null;
+		try {
+			streamReader = new InputStreamReader(inputStream);
+			final JsonElement rawElement = gson.fromJson(streamReader, JsonElement.class);
+			return deserializeObject(rawElement, clazz, responseHeaders);
+		} finally {
+			closeQuietly(streamReader);
+		}
 	}
 
 	@SuppressWarnings("unchecked")
+	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
 		final T jsonObject = gson.fromJson(rawElement, clazz);
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 865f512a2..150378829 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -22,6 +22,8 @@
 
 package com.microsoft.graph.serializer;
 
+import com.google.gson.JsonElement;
+
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
@@ -59,8 +61,8 @@ public interface ISerializer {
     /**
      * Deserialize an object from the input string
      * 
-     * @param inputStream     the string that stores the representation of the item
-     * @param clazz           the .class of the item to be deserialized
+     * @param inputStream     the stream that stores the representation of the item
+     * @param clazz           the {@code Class} of the item to be deserialized
      * @param responseHeaders the HTTP response headers
      * @param <T>             the type of the item to be deserialized
      * @return                the deserialized item from the input string
@@ -68,6 +70,19 @@ public interface ISerializer {
     @Nullable
     <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
 
+    /**
+     * Deserialize an object from the input string
+     *
+     * @param jsonElement     the {@code JsonElement} that stores the representation of the item
+     * @param clazz           the {@code Class} of the item to be deserialized
+     * @param responseHeaders the HTTP response headers
+     * @param <T>             the type of the item to be deserialized
+     * @return                the deserialized item from the input string
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz, @Nonnull Map<String, List<String>> responseHeaders);
+
     /**
      * Serializes an object into a string
      * 
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index adaa53db1..208d3c364 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -1,5 +1,7 @@
 package com.microsoft.graph.core;
 
+import com.google.gson.JsonElement;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
@@ -8,6 +10,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 
 import okhttp3.Request;
@@ -79,6 +83,18 @@ public <T> T deserializeObject(InputStream inputStream, Class<T> clazz,
                 return null;
             }
 
+            @Nullable
+            @Override
+            public <T> T deserializeObject(@NotNull JsonElement jsonElement, @NotNull Class<T> clazz, @NotNull Map<String, List<String>> responseHeaders) {
+                return null;
+            }
+
+            @Nullable
+            @Override
+            public <T> T deserializeObject(@NotNull String inputString, @NotNull Class<T> clazz) {
+                return null;
+            }
+
             @Override
             public <T> T deserializeObject(InputStream inputString, Class<T> clazz) {
                 return null;
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
index b7ca9b91f..4e168120e 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -1,26 +1,21 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.anyObject;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 
-import javax.annotation.meta.When;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.options.FunctionOption;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.serializer.ISerializer;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Mockito;
 
-import okhttp3.Call;
+import java.util.ArrayList;
+import java.util.Arrays;
+
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
@@ -28,14 +23,13 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.logger.ILogger;
-import com.microsoft.graph.options.FunctionOption;
-import com.microsoft.graph.options.Option;
-import com.microsoft.graph.options.QueryOption;
-import com.microsoft.graph.serializer.ISerializer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Test cases for {@see BaseCollectionRequest}
@@ -79,10 +73,10 @@ public void setUp() throws Exception {
         resultobj.add("id", new JsonPrimitive("zzz"));
         @SuppressWarnings("unchecked")
         final ICollectionResponse<JsonObject> result = mock(ICollectionResponse.class);
-        when(result.values()).thenReturn(new ArrayList<JsonObject>(Arrays.asList(resultobj)));
+        when(result.values()).thenReturn(new ArrayList<>(Arrays.asList(resultobj)));
         final ISerializer mSerializer = mock(ISerializer.class);
-        when(mSerializer.deserializeObject(anyObject(), anyObject(), anyObject())).thenReturn(result);
-        when(mSerializer.serializeObject(anyObject())).thenReturn("[{ \"id\": \"zzz\" }]");
+        when(mSerializer.deserializeObject(anyString(), any())).thenReturn(result);
+        when(mSerializer.serializeObject(any())).thenReturn("[{ \"id\": \"zzz\" }]");
         CoreHttpProvider mProvider = new CoreHttpProvider(mSerializer,
                 mock(ILogger.class),
                 mockClient);

From c3a67f21d1f0fbeae8fa08d67e48bef0d159fc44 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 17:47:09 +0100
Subject: [PATCH 140/213] refactoring: use default methods in ISerializer

---
 .../graph/serializer/DefaultSerializer.java   | 18 ++---------
 .../graph/serializer/ISerializer.java         | 31 +++++++++++++++----
 .../graph/core/GraphServiceClientTest.java    | 15 ++++-----
 3 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index cf10a4091..be33e928a 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -73,26 +73,12 @@ public DefaultSerializer(@Nonnull final ILogger logger) {
 		this.gson = GsonFactory.getGsonInstance(logger);
 	}
 
-	/**
-	 * Deserializes an object from the input string
-	 *
-	 * @param inputStream the string that stores the representation of the item
-	 * @param clazz	   the class of the item to be deserialized
-	 * @param <T>		 the type of the item to be deserialized
-	 * @return			the deserialized item from the input string
-	 */
-	@Override
-	@Nullable
-	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz) {
-		return deserializeObject(inputStream, clazz, emptyMap());
-	}
-
 	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
-	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
+	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
 		final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
-		return deserializeObject(rawElement, clazz, emptyMap());
+		return deserializeObject(rawElement, clazz, responseHeaders);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 150378829..7b3dedd11 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -25,12 +25,15 @@
 import com.google.gson.JsonElement;
 
 import java.io.InputStream;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
+import static java.util.Collections.emptyMap;
+
 /**
  * Serializes and deserializes items from strings into their types
  */
@@ -45,21 +48,37 @@ public interface ISerializer {
      * @return            the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz);
+    default <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
+        return deserializeObject(inputString, clazz, emptyMap());
+    }
 
     /**
      * Deserialize an object from the input string
      *
+     * @param inputString     the string that stores the representation of the item
+     * @param clazz           the {@code Class} of the item to be deserialized
+     * @param responseHeaders the HTTP response headers
+     * @param <T>             the type of the item to be deserialized
+     * @return                the deserialized item from the input string
+     */
+    @Nullable
+    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
+
+    /**
+     * Deserialize an object from the input stream
+     *
      * @param inputStream the stream that stores the representation of the item
      * @param clazz       the {@code Class} of the item to be deserialized
      * @param <T>         the type of the item to be deserialized
-     * @return            the deserialized item from the input string
+     * @return the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz);
-    
+    default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz) {
+        return deserializeObject(inputStream, clazz, emptyMap());
+    }
+
     /**
-     * Deserialize an object from the input string
+     * Deserialize an object from the input stream
      * 
      * @param inputStream     the stream that stores the representation of the item
      * @param clazz           the {@code Class} of the item to be deserialized
@@ -71,7 +90,7 @@ public interface ISerializer {
     <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
 
     /**
-     * Deserialize an object from the input string
+     * Deserialize an object from the input JsonElement
      *
      * @param jsonElement     the {@code JsonElement} that stores the representation of the item
      * @param clazz           the {@code Class} of the item to be deserialized
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index 208d3c364..1460586f8 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -77,26 +77,23 @@ public <T> String serializeObject(T serializableObject) {
                 return null;
             }
 
+            @Nullable
             @Override
-            public <T> T deserializeObject(InputStream inputStream, Class<T> clazz,
+            public <T> T deserializeObject(String inputString, Class<T> clazz,
                                            Map<String, List<String>> responseHeaders) {
                 return null;
             }
 
-            @Nullable
             @Override
-            public <T> T deserializeObject(@NotNull JsonElement jsonElement, @NotNull Class<T> clazz, @NotNull Map<String, List<String>> responseHeaders) {
+            public <T> T deserializeObject(InputStream inputStream, Class<T> clazz,
+                                           Map<String, List<String>> responseHeaders) {
                 return null;
             }
 
             @Nullable
             @Override
-            public <T> T deserializeObject(@NotNull String inputString, @NotNull Class<T> clazz) {
-                return null;
-            }
-
-            @Override
-            public <T> T deserializeObject(InputStream inputString, Class<T> clazz) {
+            public <T> T deserializeObject(JsonElement jsonElement, Class<T> clazz,
+                                           Map<String, List<String>> responseHeaders) {
                 return null;
             }
         };

From b73d8985758e294aeac021cd0b5c62f82708c4aa Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 18:08:38 +0100
Subject: [PATCH 141/213] minor cleanup

---
 .../java/com/microsoft/graph/http/CoreHttpProvider.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 8fd99e619..a108ea951 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -419,8 +419,8 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
 
                 final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
 
-                if(response.body() == null || response.body().contentLength() == 0)
-                    return (Result) null;
+				if (response.body() == null || response.body().contentLength() == 0)
+					return null;
 
                 final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
                 if (contentType != null && resultClass != InputStream.class &&
@@ -435,7 +435,7 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                             contentType.contains(Constants.TEXT_CONTENT_TYPE)) {
                     return handleRawResponse(in, resultClass);
                 } else {
-                    return (Result) null;
+                    return null;
                 }
             } finally {
                 if (!isBinaryStreamInput) {
@@ -463,7 +463,7 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
 	 *
 	 * @param request      the request that caused the failed response
 	 * @param serializable the body of the request
-	 * @param connection   the URL connection
+	 * @param response     the original response object
 	 * @throws IOException an exception occurs if there were any problems interacting with the connection object
 	 */
 	private <Body> void handleErrorResponse(final IHttpRequest request,

From f59243ed1c6171cea2c30cc19159167bbc819178 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 18:10:33 +0100
Subject: [PATCH 142/213] minor cleanup

---
 .../graph/concurrency/ChunkedUploadResponseHandler.java       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index e42a93350..23c963b37 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -133,8 +133,4 @@ public ChunkedUploadResult<UploadType> generateResult(
 		}
 		return new ChunkedUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
 	}
-
-	private boolean isUploadSessionCompleted(Response response) {
-		return response.code() == HTTP_OK || response.code() == HTTP_CREATED;
-	}
 }

From 57fedb39813d7e772166a467aff7a2584a20836e Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 18:13:48 +0100
Subject: [PATCH 143/213] Added Nullable

---
 src/main/java/com/microsoft/graph/Util.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/Util.java b/src/main/java/com/microsoft/graph/Util.java
index b7c3e7c91..24e0fc9d7 100644
--- a/src/main/java/com/microsoft/graph/Util.java
+++ b/src/main/java/com/microsoft/graph/Util.java
@@ -1,12 +1,13 @@
 package com.microsoft.graph;
 
 import java.io.Closeable;
-import java.io.IOException;
+
+import javax.annotation.Nullable;
 
 public final class Util {
     private Util() {}
 
-    public static void closeQuietly(Closeable closeable) {
+    public static void closeQuietly(@Nullable Closeable closeable) {
         if (closeable == null) {
             return;
         }

From 7ca3113574c7a19a73040d9c0d4367adea0a2b15 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Tue, 26 Jan 2021 18:28:33 +0100
Subject: [PATCH 144/213] improved error parsing

---
 .../graph/http/GraphServiceException.java     | 58 +++++++++++--------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index fbe1016d1..b5053c8f3 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -25,7 +25,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -35,6 +34,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
+import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.microsoft.graph.core.ClientException;
@@ -43,6 +43,8 @@
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.serializer.ISerializer;
 
+import org.jetbrains.annotations.NotNull;
+
 import okhttp3.Response;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -381,30 +383,8 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
         }
 
         final String responseMessage = response.message();
-        String rawOutput;
 
-        InputStream is = response.body().byteStream();
-        try {
-            rawOutput = CoreHttpProvider.streamToString(is);
-        } finally {
-            closeQuietly(is);
-        }
-        GraphErrorResponse error;
-        try {
-            // we need a "copy" of the stream, so we can log the raw output if it cannot be parsed
-            error = serializer.deserializeObject(
-                    new ByteArrayInputStream(rawOutput.getBytes(UTF_8)),
-                    GraphErrorResponse.class,
-                    responseHeadersHelper.getResponseHeadersAsMapOfStringList(response)
-            );
-        } catch (final Exception ex) {
-            error = new GraphErrorResponse();
-            error.error = new GraphError();
-            error.error.code = "Unable to parse error response message";
-            error.error.message = "Raw error: " + rawOutput;
-            error.error.innererror = new GraphInnerError();
-            error.error.innererror.code = ex.getMessage();
-        }
+        GraphErrorResponse error = parseErrorResponse(serializer, response);
 
         if (responseCode >= INTERNAL_SERVER_ERROR) {
             return new GraphFatalServiceException(method,
@@ -428,4 +408,34 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
                 error,
                 isVerbose);
     }
+
+    private static GraphErrorResponse parseErrorResponse(@NotNull ISerializer serializer,
+                                                         @NotNull Response response)
+            throws IOException {
+
+        byte[] responseBytes;
+        InputStream is = response.body().byteStream();
+        try {
+            responseBytes = ByteStreams.toByteArray(is);
+        } finally {
+            closeQuietly(is);
+        }
+        GraphErrorResponse error;
+        try {
+            // we need a "copy" of the stream, so we can log the raw output if it cannot be parsed
+            error = serializer.deserializeObject(
+                    new ByteArrayInputStream(responseBytes),
+                    GraphErrorResponse.class,
+                    responseHeadersHelper.getResponseHeadersAsMapOfStringList(response)
+            );
+        } catch (final Exception ex) {
+            error = new GraphErrorResponse();
+            error.error = new GraphError();
+            error.error.code = "Unable to parse error response message";
+            error.error.message = "Raw error: " + new String(responseBytes, UTF_8);
+            error.error.innererror = new GraphInnerError();
+            error.error.innererror.code = ex.getMessage();
+        }
+        return error;
+    }
 }

From 36e4b6b959d6b4386ba0f7cba20e6ec71158e9f4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 26 Jan 2021 16:59:46 -0500
Subject: [PATCH 145/213] - fixes a bug where collection responses would not
 respect odata inheritance

---
 .../graph/http/BaseCollectionResponse.java    |  15 +-
 .../graph/httpcore/ChaosHttpHandler.java      |   4 +-
 .../serializer/CollectionPageSerializer.java  | 158 ++++++++----------
 .../CollectionResponseSerializer.java         |  85 ++++++++++
 .../graph/serializer/DefaultSerializer.java   |   4 +-
 .../graph/serializer/GsonFactory.java         |  10 ++
 6 files changed, 174 insertions(+), 102 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
index a560d0ad9..ad80bc96b 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
@@ -11,15 +11,14 @@
 import com.microsoft.graph.serializer.IJsonBackedObject;
 import com.microsoft.graph.serializer.ISerializer;
 import com.microsoft.graph.serializer.AdditionalDataManager;
-import com.microsoft.graph.http.ICollectionResponse;
 
 /**
  * The basic collection response implementation
- * 
+ *
  * @param <T> the entity or complex type
  */
-public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T>, IJsonBackedObject  {
-	
+public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T> {
+
 	/**
      * The list of items within this collection page
      */
@@ -27,7 +26,7 @@ public abstract class BaseCollectionResponse<T> implements ICollectionResponse<T
     @Expose
     @Nullable
 	public java.util.List<T> value;
-	
+
 
 	/**
      * The list of items within this collection page
@@ -43,7 +42,7 @@ public java.util.List<T> values() {
     @Expose(serialize = false)
     @Nullable
     public String nextLink;
-	
+
     @Override
     @Nullable
     public String nextLink() {
@@ -69,7 +68,7 @@ public final AdditionalDataManager additionalDataManager() {
      */
     @Nullable
 	protected ISerializer serializer;
-	
+
 	/**
      * Gets the raw representation of this class
      *
@@ -110,4 +109,4 @@ public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final J
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
index 1a405ab9f..2e32b62c3 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
@@ -32,7 +32,7 @@ public class ChaosHttpHandler implements Interceptor {
     /**
      * Denominator for the failure rate (i.e. 1/X)
      */
-    private final Integer failureRate = 3;
+    private final int failureRate = 3;
     /**
      * default value to return on retry after
      */
@@ -55,7 +55,7 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
             request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
         request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
 
-        final Integer dice = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);
+        final int dice = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);
 
         if(dice % failureRate == 0) {
             return new Response
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index dbd598cf5..8c73cb686 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -24,8 +24,6 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Nullable;
@@ -36,115 +34,95 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
-import com.google.common.reflect.TypeToken;
 import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.http.BaseCollectionResponse;
 import com.microsoft.graph.http.BaseRequestBuilder;
-import com.microsoft.graph.http.IRequestBuilder;
 import com.microsoft.graph.logger.ILogger;
 
 /** Specialized serializer to handle collection pages */
 public class CollectionPageSerializer {
 
-	private static DefaultSerializer serializer;
-	/** length of the word "page" */
-	private final static Integer pageLength = 4;
-	/** length of the word "collection" */
-	private final static Integer collectionLength = 10;
-	/** length of the work "response" */
-	private final static Integer responseLength = 8;
+    private static DefaultSerializer serializer;
+    /** length of the work "response" */
+    private final static int responseLength = 8;
+    /** length of the work "page" */
+    private final static int pageLength = 4;
 
-	/**
-	 * Not available for instantiation
-	 */
-	private CollectionPageSerializer() {
-	}
+    /**
+     * Not available for instantiation
+     */
+    private CollectionPageSerializer() {
+    }
 
-	/**
+    /**
      * Serializes an CollectionPage
      *
      * @param src the CollectionPage variable for serialization
      * @param logger the logger
-	 * @param <T1> the entity type for the collection
-	 * @param <T2> the collection request builder interface type
+     * @param <T1> the entity type for the collection
+     * @param <T2> the collection request builder interface type
      * @return       JsonElement of CollectionPage
      */
-	@Nullable
-	public static <T1, T2 extends BaseRequestBuilder<T1>> JsonElement serialize(@Nonnull final BaseCollectionPage<T1, T2> src, @Nonnull final ILogger logger) {
-		if(src == null) {
-			return null;
-		}
-		JsonArray jsonArray = new JsonArray();
-		List<T1> items = src.getCurrentPage();
-		serializer = new DefaultSerializer(logger);
-		for(T1 item : items) {
-			final String json = serializer.serializeObject(item);
-			final JsonElement element = JsonParser.parseString(json);
-			if(element != null && element.isJsonObject()) {
-				final JsonObject jsonObject = element.getAsJsonObject();
-				jsonArray.add(jsonObject);
-			}
-		}
-		return jsonArray;
-	}
+    @Nullable
+    public static <T1, T2 extends BaseRequestBuilder<T1>> JsonElement serialize(@Nonnull final BaseCollectionPage<T1, T2> src, @Nonnull final ILogger logger) {
+        if(src == null) {
+            return null;
+        }
+        JsonArray jsonArray = new JsonArray();
+        List<T1> items = src.getCurrentPage();
+        serializer = new DefaultSerializer(logger);
+        for(T1 item : items) {
+            final String json = serializer.serializeObject(item);
+            final JsonElement element = JsonParser.parseString(json);
+            if(element != null && element.isJsonObject()) {
+                final JsonObject jsonObject = element.getAsJsonObject();
+                jsonArray.add(jsonObject);
+            }
+        }
+        return jsonArray;
+    }
 
-	/**
+    /**
      * Deserializes the JsonElement
      *
      * @param json the source CollectionPage's Json
-   	 * @param typeOfT The type of the CollectionPage to deserialize to
+     * @param typeOfT The type of the CollectionPage to deserialize to
      * @param logger the logger
-	 * @param <T1> the entity type for the collection
-	 * @param <T2> the collection request builder interface type
+     * @param <T1> the entity type for the collection
+     * @param <T2> the collection request builder interface type
      * @throws JsonParseException the parse exception
      * @return    the deserialized CollectionPage
      */
-	@SuppressWarnings("unchecked")
-	@Nullable
-	public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2> deserialize(@Nonnull final JsonElement json, @Nonnull final Type typeOfT, @Nonnull final ILogger logger) throws JsonParseException {
-		if (json == null || !json.isJsonArray() || !typeOfT.getClass().equals(Class.class)) {
-			return null;
-		}
-		serializer = new DefaultSerializer(logger);
-		final JsonArray sourceArray = json.getAsJsonArray();
-		final ArrayList<T1> list = new ArrayList<T1>(sourceArray.size());
-		/** eg: com.microsoft.graph.requests.AttachmentCollectionPage */
-		final String collectionPageClassCanonicalName = ((Class<?>)typeOfT).getName();
-		/** eg: com.microsoft.graph.models.Attachment */
-		final String baseEntityClassCanonicalName = collectionPageClassCanonicalName
-					.substring(0, collectionPageClassCanonicalName.length() - pageLength - collectionLength)
-					.replace("requests", "models");
-		try {
-			final Class<?> baseEntityClass = Class.forName(baseEntityClassCanonicalName);
-			for(JsonElement sourceElement : sourceArray) {
-				if(sourceElement.isJsonObject()) {
-					final JsonObject sourceObject = sourceElement.getAsJsonObject();
-					Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
-					if(entityClass == null)
-						entityClass = baseEntityClass;
-					final T1 targetObject = (T1)serializer.deserializeObject(sourceObject.toString(), entityClass);
-					((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
-					list.add(targetObject);
-				}
-			}
-			/** eg: com.microsoft.graph.requests.AttachmentCollectionResponse */
-			final String responseClassCanonicalName = collectionPageClassCanonicalName
-						.substring(0, collectionPageClassCanonicalName.length() - pageLength) + "Response";
-			final Class<?> responseClass = Class.forName(responseClassCanonicalName);
-			final Object response = responseClass.getConstructor().newInstance();
-			responseClass.getField("value").set(response, list);
-			final Class<?> collectionPageClass = Class.forName(collectionPageClassCanonicalName);
-			/** eg: com.microsoft.graph.requests.AttachmentCollectionRequestBuilder */
-			final String responseBuilderCanonicalName = responseClassCanonicalName
-						.substring(0, responseClassCanonicalName.length() - responseLength) + "RequestBuilder";
-			final Class<?> responseBuilderClass = Class.forName(responseBuilderCanonicalName);
-			return (BaseCollectionPage<T1, T2>)collectionPageClass.getConstructor(responseClass, responseBuilderClass).newInstance(response, null);
-		} catch(ClassNotFoundException ex) {
-			logger.logError("Could not find class during deserialization", ex);
-		} catch(NoSuchMethodException | InstantiationException | InvocationTargetException ex) {
-			logger.logError("Could not instanciate type during deserialization", ex);
-		} catch(NoSuchFieldException | IllegalAccessException ex) {
-			logger.logError("Unable to set field value during deserialization", ex);
-		}
-		return null;
-	}
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public static <T1, T2 extends BaseRequestBuilder<T1>> BaseCollectionPage<T1, T2> deserialize(@Nonnull final JsonElement json, @Nonnull final Type typeOfT, @Nonnull final ILogger logger) throws JsonParseException {
+        if (json == null || !json.isJsonArray() || !typeOfT.getClass().equals(Class.class)) {
+            return null;
+        }
+        serializer = new DefaultSerializer(logger);
+        /** eg: com.microsoft.graph.requests.AttachmentCollectionPage */
+        final String collectionPageClassCanonicalName = ((Class<?>)typeOfT).getName();
+        try {
+            /** eg: com.microsoft.graph.requests.AttachmentCollectionResponse */
+            final String responseClassCanonicalName = collectionPageClassCanonicalName
+                        .substring(0, collectionPageClassCanonicalName.length() - pageLength) + "Response";
+            final Class<?> responseClass = Class.forName(responseClassCanonicalName);
+            final JsonObject responseJson = new JsonObject();
+            responseJson.add("value", json);
+            final BaseCollectionResponse<T1> response = CollectionResponseSerializer.deserialize(responseJson, responseClass, logger);
+            /** eg: com.microsoft.graph.requests.AttachmentCollectionRequestBuilder */
+            final String responseBuilderCanonicalName = responseClassCanonicalName
+                        .substring(0, responseClassCanonicalName.length() - responseLength) + "RequestBuilder";
+            final Class<?> responseBuilderClass = Class.forName(responseBuilderCanonicalName);
+            final Class<?> collectionPageClass = Class.forName(collectionPageClassCanonicalName);
+            return (BaseCollectionPage<T1, T2>)collectionPageClass.getConstructor(responseClass, responseBuilderClass).newInstance(response, null);
+        } catch(ClassNotFoundException ex) {
+            logger.logError("Could not find class during deserialization", ex);
+        } catch(NoSuchMethodException | InstantiationException | InvocationTargetException ex) {
+            logger.logError("Could not instanciate type during deserialization", ex);
+        } catch(IllegalAccessException ex) {
+            logger.logError("Unable to set field value during deserialization", ex);
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
new file mode 100644
index 000000000..c368c5c42
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
@@ -0,0 +1,85 @@
+package com.microsoft.graph.serializer;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.microsoft.graph.http.BaseCollectionResponse;
+import com.microsoft.graph.logger.ILogger;
+
+/** Specialized serializer to handle collection responses */
+public class CollectionResponseSerializer {
+    private static DefaultSerializer serializer;
+    /**
+     * Not available for instantiation
+     */
+    private CollectionResponseSerializer() {}
+    /**
+     * Deserializes the JsonElement
+     *
+     * @param json the source CollectionResponse's Json
+     * @param typeOfT The type of the CollectionResponse to deserialize to
+     * @param logger the logger
+     * @param <T1> the entity type for the collection
+     * @throws JsonParseException the parse exception
+     * @return    the deserialized CollectionResponse
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonElement json, @Nonnull final Type typeOfT, @Nonnull final ILogger logger) throws JsonParseException {
+        if (json == null || !json.isJsonObject()| !typeOfT.getClass().equals(Class.class)) {
+            return null;
+        }
+        serializer = new DefaultSerializer(logger);
+        final JsonObject jsonAsObject = json.getAsJsonObject();
+        final JsonArray sourceArray = jsonAsObject.get("value").getAsJsonArray();
+        final ArrayList<T1> list = new ArrayList<T1>(sourceArray.size());
+        /** eg: com.microsoft.graph.requests.AttachmentCollectionResponse */
+        /** eg: com.microsoft.graph.requests.DriveItemDeltaCollectionResponse */
+        /** eg: com.microsoft.graph.requests.DriveItemGetActivitiesByIntervalCollectionResponse */
+        final Class<?> responseClass = ((Class<?>)typeOfT);
+        /** eg: com.microsoft.graph.http.BaseCollectionResponse<com.microsoft.graph.models.DriveItem> */
+        final String genericResponseName = responseClass.getGenericSuperclass().toString();
+        final int indexOfGenericMarker = genericResponseName.indexOf('<');
+        /** eg: com.microsoft.graph.models.Attachment */
+        final String baseEntityClassCanonicalName = genericResponseName
+                                                        .substring(indexOfGenericMarker + 1, genericResponseName.length() - 1);
+        Class<?> baseEntityClass;
+        try {
+            baseEntityClass = Class.forName(baseEntityClassCanonicalName);
+        } catch (ClassNotFoundException ex) {
+            //it is possible we can't find the parent base class depending on the response class name, see examples
+            baseEntityClass = null;
+            logger.logDebug("could not find class" + baseEntityClassCanonicalName);
+        }
+        try {
+            for(JsonElement sourceElement : sourceArray) {
+                if(sourceElement.isJsonObject()) {
+                    final JsonObject sourceObject = sourceElement.getAsJsonObject();
+                    Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
+                    if(entityClass == null && baseEntityClass != null)
+                        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.toString(), entityClass);
+                    ((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
+                    list.add(targetObject);
+                }
+            }
+            final BaseCollectionResponse<T1> response = (BaseCollectionResponse<T1>)responseClass.getConstructor().newInstance();
+            response.value = list;
+            response.setRawObject(serializer, jsonAsObject);
+            return response;
+        } catch(NoSuchMethodException | InstantiationException | InvocationTargetException ex) {
+            logger.logError("Could not instanciate type during deserialization", ex);
+        } catch(IllegalAccessException ex) {
+            logger.logError("Unable to set field value during deserialization", ex);
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 7cc7e3c39..2465e3782 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -347,7 +347,7 @@ public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nonnull f
 		if (jsonObject.get(ODATA_TYPE_KEY) != null) {
 			/** #microsoft.graph.user or #microsoft.graph.callrecords.callrecord */
 			final String odataType = jsonObject.get(ODATA_TYPE_KEY).getAsString();
-			final Integer lastDotIndex = odataType.lastIndexOf(".");
+			final int lastDotIndex = odataType.lastIndexOf(".");
 			final String derivedType = (odataType.substring(0, lastDotIndex) +
 											".models." +
 											CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL,
@@ -356,7 +356,7 @@ public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nonnull f
 			try {
 				Class<?> derivedClass = Class.forName(derivedType);
 				//Check that the derived class inherits from the given parent class
-				if (parentClass.isAssignableFrom(derivedClass)) {
+				if (parentClass == null || parentClass.isAssignableFrom(derivedClass)) {
 					return derivedClass;
 				}
 				return null;
diff --git a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
index af4d88b72..d80a5b371 100644
--- a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
+++ b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
@@ -32,6 +32,7 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import com.microsoft.graph.http.BaseCollectionPage;
+import com.microsoft.graph.http.BaseCollectionResponse;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.core.DateOnly;
 
@@ -230,6 +231,14 @@ public JsonElement serialize(final BaseCollectionPage<?, ?> src,
                 return CollectionPageSerializer.deserialize(json, typeOfT, logger);
             }
         };
+        final JsonDeserializer<BaseCollectionResponse<?>> collectionResponseDeserializer = new JsonDeserializer<BaseCollectionResponse<?>>() {
+            @Override
+            public BaseCollectionResponse<?> deserialize(final JsonElement json,
+                                        final Type typeOfT,
+                                        final JsonDeserializationContext context) throws JsonParseException {
+                return CollectionResponseSerializer.deserialize(json, typeOfT, logger);
+            }
+        };
 
         final JsonDeserializer<TimeOfDay> timeOfDayJsonDeserializer = new JsonDeserializer<TimeOfDay>() {
             @Override
@@ -260,6 +269,7 @@ public TimeOfDay deserialize(final JsonElement json,
                 .registerTypeAdapter(Duration.class, durationJsonDeserializer)
                 .registerTypeHierarchyAdapter(BaseCollectionPage.class, collectionPageSerializer)
                 .registerTypeHierarchyAdapter(BaseCollectionPage.class, collectionPageDeserializer)
+                .registerTypeHierarchyAdapter(BaseCollectionResponse.class, collectionResponseDeserializer)
                 .registerTypeAdapter(TimeOfDay.class, timeOfDayJsonDeserializer)
                 .registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger))
                 .create();

From 15eaaf69fdd551adf5dd60ed1b1195815a26dc18 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Wed, 27 Jan 2021 15:23:00 +0100
Subject: [PATCH 146/213] added a comment

---
 src/main/java/com/microsoft/graph/Util.java     |  9 +++++++++
 .../microsoft/graph/serializer/ISerializer.java | 17 +++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/Util.java b/src/main/java/com/microsoft/graph/Util.java
index 24e0fc9d7..f2c005c15 100644
--- a/src/main/java/com/microsoft/graph/Util.java
+++ b/src/main/java/com/microsoft/graph/Util.java
@@ -4,9 +4,18 @@
 
 import javax.annotation.Nullable;
 
+/**
+ * Class with commonly used utility methods.<br/>
+ * <b>Note</b>: This class is meant for internal SDK use only and SDK users should not take a
+ * dependency on it.
+ */
 public final class Util {
     private Util() {}
 
+    /**
+     * Closes a {@code Closeable} quietly, i.e. ignores any exceptions thrown when {@code close()}.
+     * @param closeable The {@code Closeable} instance to be quietly closed.
+     */
     public static void closeQuietly(@Nullable Closeable closeable) {
         if (closeable == null) {
             return;
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 7b3dedd11..3170d3712 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -25,12 +25,11 @@
 import com.google.gson.JsonElement;
 
 import java.io.InputStream;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import static java.util.Collections.emptyMap;
 
@@ -89,6 +88,20 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
     @Nullable
     <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
 
+    /**
+     * Deserialize an object from the input JsonElement
+     *
+     * @param jsonElement     the {@code JsonElement} that stores the representation of the item
+     * @param clazz           the {@code Class} of the item to be deserialized
+     * @param <T>             the type of the item to be deserialized
+     * @return the deserialized item from the input string
+     */
+    @SuppressWarnings("unchecked")
+    @Nullable
+    default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz) {
+        return deserializeObject(jsonElement, clazz, emptyMap());
+    }
+
     /**
      * Deserialize an object from the input JsonElement
      *

From 59795a87d4a682114bf57e8646c7319172f04c81 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Wed, 27 Jan 2021 15:41:15 +0100
Subject: [PATCH 147/213] ChunkedUploadResponseHandler: Use InputStream to
 parse ChunkedUploadResult

---
 .../ChunkedUploadResponseHandler.java         | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index 23c963b37..080a1a449 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -22,6 +22,8 @@
 
 package com.microsoft.graph.concurrency;
 
+import com.google.common.io.ByteStreams;
+
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.http.CoreHttpProvider;
@@ -33,7 +35,11 @@
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
@@ -111,19 +117,7 @@ public ChunkedUploadResult<UploadType> generateResult(
 			final String location = headers.get("Location");
 			if (contentType != null
 					&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
-				try (final InputStream in = new BufferedInputStream(response.body().byteStream())) {
-					final String rawJson = CoreHttpProvider.streamToString(in);
-					final IUploadSession session = serializer.deserializeObject(rawJson, uploadSessionClass);
-
-					if (session == null || session.getNextExpectedRanges() == null) {
-						logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
-						final UploadType uploadedItem = serializer.deserializeObject(in, this.deserializeTypeClass);
-						return new ChunkedUploadResult<>(uploadedItem);
-					} else {
-						logger.logDebug("Chunk bytes has been accepted by the server.");
-						return new ChunkedUploadResult<>(session);
-					}
-				}
+				return parseJsonUploadResult(response, serializer, logger);
 			} else if (location != null) {
 				logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
 				return new ChunkedUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
@@ -133,4 +127,21 @@ public ChunkedUploadResult<UploadType> generateResult(
 		}
 		return new ChunkedUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
 	}
+
+	@NotNull
+	private ChunkedUploadResult<UploadType> parseJsonUploadResult(@NotNull Response response, @NotNull ISerializer serializer, @NotNull ILogger logger) throws IOException {
+		try (final InputStream in = response.body().byteStream()) {
+			final byte[] responseBytes = ByteStreams.toByteArray(in);
+			final IUploadSession session = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), uploadSessionClass);
+
+			if (session == null || session.getNextExpectedRanges() == null) {
+				logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
+				final UploadType uploadedItem = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), this.deserializeTypeClass);
+				return new ChunkedUploadResult<>(uploadedItem);
+			} else {
+				logger.logDebug("Chunk bytes has been accepted by the server.");
+				return new ChunkedUploadResult<>(session);
+			}
+		}
+	}
 }

From d28f239668835059cf7dbf8448c4e008ad8a4f32 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 27 Jan 2021 10:36:29 -0500
Subject: [PATCH 148/213] - removes use of emptymaps to avoid illegal
 refelctive warnings

---
 .../graph/serializer/DefaultSerializer.java   |  1 -
 .../graph/serializer/ISerializer.java         | 20 +++++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index be33e928a..73a038214 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -45,7 +45,6 @@
 import javax.annotation.Nullable;
 
 import static com.microsoft.graph.Util.closeQuietly;
-import static java.util.Collections.emptyMap;
 
 /**
  * The default serializer implementation for the SDK
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 3170d3712..615c0d3a1 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.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
@@ -31,8 +31,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import static java.util.Collections.emptyMap;
-
 /**
  * Serializes and deserializes items from strings into their types
  */
@@ -40,7 +38,7 @@ public interface ISerializer {
 
     /**
      * Deserialize an object from the input string
-     * 
+     *
      * @param inputString the string that stores the representation of the item
      * @param clazz       the {@code Class} of the item to be deserialized
      * @param <T>         the type of the item to be deserialized
@@ -48,7 +46,7 @@ public interface ISerializer {
      */
     @Nullable
     default <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz) {
-        return deserializeObject(inputString, clazz, emptyMap());
+        return deserializeObject(inputString, clazz, null);
     }
 
     /**
@@ -73,12 +71,12 @@ default <T> T deserializeObject(@Nonnull final String inputString, @Nonnull fina
      */
     @Nullable
     default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz) {
-        return deserializeObject(inputStream, clazz, emptyMap());
+        return deserializeObject(inputStream, clazz, null);
     }
 
     /**
      * Deserialize an object from the input stream
-     * 
+     *
      * @param inputStream     the stream that stores the representation of the item
      * @param clazz           the {@code Class} of the item to be deserialized
      * @param responseHeaders the HTTP response headers
@@ -99,7 +97,7 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
     @SuppressWarnings("unchecked")
     @Nullable
     default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz) {
-        return deserializeObject(jsonElement, clazz, emptyMap());
+        return deserializeObject(jsonElement, clazz, null);
     }
 
     /**
@@ -117,7 +115,7 @@ default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class
 
     /**
      * Serializes an object into a string
-     * 
+     *
      * @param serializableObject the object to convert into a string
      * @param <T>                the type of the item to be serialized
      * @return                   the string representation of that item

From a3a70fb176f3ad72d9f6bb913e373eb1e8a10b5c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 27 Jan 2021 11:13:07 -0500
Subject: [PATCH 149/213] - removes unecessary imports and deprecated
 annotation

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 901301d3d..0f7c34db0 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -24,15 +24,12 @@
 
 import java.net.URL;
 import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.ICollectionResponse;
-import com.microsoft.graph.http.BaseCollectionPage;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
 import com.microsoft.graph.options.FunctionOption;
@@ -96,7 +93,6 @@ public BaseCollectionRequest(@Nonnull final String requestUrl,
      * Send this request
      *
      * @return the response object
-     * @deprecated use the future API instead
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable

From 08359578dc6483459d6ff92e320c059f01f54438 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 27 Jan 2021 11:13:39 -0500
Subject: [PATCH 150/213] - removes uncessary deprecated annotations

---
 src/main/java/com/microsoft/graph/serializer/ISerializer.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index 615c0d3a1..cf3efc973 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -94,7 +94,6 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
      * @param <T>             the type of the item to be deserialized
      * @return the deserialized item from the input string
      */
-    @SuppressWarnings("unchecked")
     @Nullable
     default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz) {
         return deserializeObject(jsonElement, clazz, null);
@@ -109,7 +108,6 @@ default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class
      * @param <T>             the type of the item to be deserialized
      * @return                the deserialized item from the input string
      */
-    @SuppressWarnings("unchecked")
     @Nullable
     <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz, @Nonnull Map<String, List<String>> responseHeaders);
 

From 27b98ec8a67bd0c798f233ddc29fedb0160a2ccf Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 27 Jan 2021 11:14:01 -0500
Subject: [PATCH 151/213] - fixes a mocks types to prevent unit tests from
 failing

---
 .../com/microsoft/graph/http/BaseCollectionRequestTests.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
index 4e168120e..2b6e67e53 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -13,6 +13,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -27,7 +28,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -75,7 +75,7 @@ public void setUp() throws Exception {
         final ICollectionResponse<JsonObject> result = mock(ICollectionResponse.class);
         when(result.values()).thenReturn(new ArrayList<>(Arrays.asList(resultobj)));
         final ISerializer mSerializer = mock(ISerializer.class);
-        when(mSerializer.deserializeObject(anyString(), any())).thenReturn(result);
+        when(mSerializer.deserializeObject(any(InputStream.class), any(), any())).thenReturn(result);
         when(mSerializer.serializeObject(any())).thenReturn("[{ \"id\": \"zzz\" }]");
         CoreHttpProvider mProvider = new CoreHttpProvider(mSerializer,
                 mock(ILogger.class),

From 8bdca7a00ee2ffc726a972eba51eb340e87634db Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Wed, 27 Jan 2021 17:20:26 +0100
Subject: [PATCH 152/213] fixed: self-closing element not allowed in javadoc

---
 src/main/java/com/microsoft/graph/Util.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/Util.java b/src/main/java/com/microsoft/graph/Util.java
index f2c005c15..9ec86d861 100644
--- a/src/main/java/com/microsoft/graph/Util.java
+++ b/src/main/java/com/microsoft/graph/Util.java
@@ -5,7 +5,7 @@
 import javax.annotation.Nullable;
 
 /**
- * Class with commonly used utility methods.<br/>
+ * Class with commonly used utility methods.<br>
  * <b>Note</b>: This class is meant for internal SDK use only and SDK users should not take a
  * dependency on it.
  */

From 09466e4d3fee28303c616e9b87a02e976b5d3d05 Mon Sep 17 00:00:00 2001
From: Haris Osmanagic <hosmanagic@axcient.com>
Date: Wed, 27 Jan 2021 21:10:23 +0100
Subject: [PATCH 153/213] Replace jetbrains NotNull with javax Nullable

---
 .../ChunkedUploadResponseHandler.java         |  9 ++----
 .../graph/http/GraphServiceException.java     | 29 +++++++++----------
 .../graph/core/GraphServiceClientTest.java    |  4 +--
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index 080a1a449..dbbe68ccc 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -26,7 +26,6 @@
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.Constants;
-import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.http.GraphServiceException;
 import com.microsoft.graph.http.HttpResponseCode;
 import com.microsoft.graph.http.HttpResponseHeadersHelper;
@@ -35,9 +34,6 @@
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
 
-import org.jetbrains.annotations.NotNull;
-
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -48,7 +44,6 @@
 
 import okhttp3.Response;
 
-import static com.microsoft.graph.http.HttpResponseCode.HTTP_CREATED;
 import static com.microsoft.graph.http.HttpResponseCode.HTTP_OK;
 
 /**
@@ -128,8 +123,8 @@ public ChunkedUploadResult<UploadType> generateResult(
 		return new ChunkedUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
 	}
 
-	@NotNull
-	private ChunkedUploadResult<UploadType> parseJsonUploadResult(@NotNull Response response, @NotNull ISerializer serializer, @NotNull ILogger logger) throws IOException {
+	@Nonnull
+	private ChunkedUploadResult<UploadType> parseJsonUploadResult(@Nonnull Response response, @Nonnull ISerializer serializer, @Nonnull ILogger logger) throws IOException {
 		try (final InputStream in = response.body().byteStream()) {
 			final byte[] responseBytes = ByteStreams.toByteArray(in);
 			final IUploadSession session = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), uploadSessionClass);
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index b5053c8f3..8e7ce29cd 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -22,28 +22,27 @@
 
 package com.microsoft.graph.http;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Collections;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
 import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.logger.LoggerLevel;
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.serializer.ISerializer;
 
-import org.jetbrains.annotations.NotNull;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import okhttp3.Response;
 
@@ -409,8 +408,8 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
                 isVerbose);
     }
 
-    private static GraphErrorResponse parseErrorResponse(@NotNull ISerializer serializer,
-                                                         @NotNull Response response)
+    private static GraphErrorResponse parseErrorResponse(@Nonnull ISerializer serializer,
+                                                         @Nonnull Response response)
             throws IOException {
 
         byte[] responseBytes;
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index 1460586f8..f9056400e 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -10,8 +10,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 
 import okhttp3.Request;
@@ -26,6 +24,8 @@
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
+import javax.annotation.Nullable;
+
 public class GraphServiceClientTest {
     private IAuthenticationProvider getAuthProvider() {
         return mock(IAuthenticationProvider.class);

From 08e12930af7d54aa39899f85a786a16056929314 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 29 Jan 2021 09:10:28 -0500
Subject: [PATCH 154/213] - adds missing legal header

---
 .../CollectionResponseSerializer.java         | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
index 65ecb22da..e81e69263 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
@@ -1,3 +1,25 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
 package com.microsoft.graph.serializer;
 
 import java.lang.reflect.InvocationTargetException;

From 7be8422bb1a08d3fa61dc2e3b47170c119622d28 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 29 Jan 2021 13:24:37 -0500
Subject: [PATCH 155/213] - lints

---
 src/main/java/com/microsoft/graph/http/BaseStreamRequest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
index 3da0141e8..516439bf9 100644
--- a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -26,8 +26,6 @@
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRedirect;
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
-import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
-import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 

From b52ac4363964e620f61cb98d2bab7981548e6145 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 29 Jan 2021 13:35:36 -0500
Subject: [PATCH 156/213] - upgrades to junit5

---
 build.gradle                                  |  1 +
 gradle/dependencies.gradle                    |  5 +--
 .../BaseAuthenticationProviderTest.java       |  6 ++--
 .../TokenCredentialAuthProviderTest.java      | 12 +++----
 .../content/MSBatchRequestContentTest.java    | 33 +++++++++----------
 .../graph/content/MSBatchRequestStepTest.java | 26 +++++++--------
 .../content/MSBatchResponseContentTest.java   | 14 ++++----
 .../microsoft/graph/core/BaseClientTests.java | 12 +++----
 .../graph/core/ClientExceptionTests.java      | 12 +++----
 .../graph/core/GraphServiceClientTest.java    | 15 +++++----
 .../microsoft/graph/core/MultipartTests.java  |  8 ++---
 .../graph/http/BaseCollectionPageTests.java   | 12 +++----
 .../http/BaseCollectionRequestTests.java      | 12 +++----
 .../graph/http/BaseRequestBuilderTests.java   | 10 +++---
 .../graph/http/BaseRequestTests.java          | 16 ++++-----
 .../graph/http/BaseStreamRequestTests.java    | 16 ++++-----
 .../graph/http/CoreHttpProviderTests.java     | 10 +++---
 .../graph/http/DeltaCollectionPageTests.java  |  4 +--
 .../graph/http/GraphErrorResponseTests.java   |  4 +--
 .../microsoft/graph/http/GraphErrorTests.java |  8 ++---
 .../http/GraphFatalServiceExceptionTests.java |  4 +--
 .../http/GraphServiceExceptionTests.java      |  8 ++---
 .../graph/http/ReferenceRequestBodyTests.java |  2 +-
 .../httpcore/AuthenticationHandlerTest.java   |  2 +-
 .../graph/httpcore/HttpClientsTest.java       |  4 +--
 .../graph/httpcore/RedirectHandlerTest.java   |  6 ++--
 .../graph/httpcore/RetryHandlerTest.java      | 14 ++++----
 .../graph/httpcore/TelemetryHandlerTest.java  |  6 ++--
 .../graph/httpcore/TelemetryOptionsTest.java  |  6 ++--
 .../graph/logger/DefaultLoggerTests.java      |  4 +--
 .../microsoft/graph/options/OptionTests.java  | 18 +++++-----
 .../serializer/ByteArraySerializerTests.java  |  6 ++--
 .../graph/serializer/DateOnlyTests.java       |  4 +--
 .../graph/serializer/DurationTests.java       |  4 +--
 .../graph/serializer/ISO8601Test.java         |  4 +--
 .../OffsetDateTimeSerializerTests.java        |  6 ++--
 .../graph/serializer/TimeOfDayTests.java      |  4 +--
 37 files changed, 170 insertions(+), 168 deletions(-)

diff --git a/build.gradle b/build.gradle
index 113a9cc78..15814804c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ java {
 }
 
 test {
+    useJUnitPlatform()
     finalizedBy jacocoTestReport // report is always generated after tests run
 }
 jacocoTestReport {
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index ecaacc9d4..04eaae9e5 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,7 +1,8 @@
 dependencies {
     // Use JUnit test framework
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-inline:3.6.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.mockito:mockito-inline:3.7.7'
     
     api 'com.squareup.okhttp3:okhttp:4.9.0'
 
diff --git a/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java b/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java
index 81f0bc3b8..47630890c 100644
--- a/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/BaseAuthenticationProviderTest.java
@@ -1,7 +1,7 @@
 package com.microsoft.graph.authentication;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -9,7 +9,7 @@
 import java.util.HashSet;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class BaseAuthenticationProviderTest {
     final BaseAuthenticationProvider authProvider = new BaseAuthenticationProvider() {
diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 8a0bfcd0f..339cf4ee5 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -3,9 +3,9 @@
 import com.azure.core.credential.TokenCredential;
 import com.microsoft.graph.mocks.MockTokenCredential;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 
 import java.net.MalformedURLException;
@@ -47,10 +47,10 @@ public void providerDoesntAddTokenOnInvalidHostName() throws MalformedURLExcepti
     }
     @Test
     public void providerDefensiveProgramming() {
-        assertThrows("should throw on null credentials", NullPointerException.class, () -> { new TokenCredentialAuthProvider(null); });
-        assertThrows("should throw on null scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null, mock(TokenCredential.class)); });
-        assertThrows("should throw on empty scopes", IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(new ArrayList<String>(), mock(TokenCredential.class)); });
+        assertThrows(NullPointerException.class, () -> { new TokenCredentialAuthProvider(null); }, "should throw on null credentials");
+        assertThrows(IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(null, mock(TokenCredential.class)); }, "should throw on null scopes");
+        assertThrows(IllegalArgumentException.class, () -> { new TokenCredentialAuthProvider(new ArrayList<String>(), mock(TokenCredential.class)); }, "should throw on empty scopes");
         final TokenCredentialAuthProvider provider = new TokenCredentialAuthProvider(mock(TokenCredential.class));
-        assertThrows("should throw on null url", NullPointerException.class, () -> { provider.getAuthorizationTokenAsync(null); });
+        assertThrows(NullPointerException.class, () -> { provider.getAuthorizationTokenAsync(null); }, "should throw on null url");
     }
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
index bcb71d02b..ab1fff017 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
@@ -1,9 +1,9 @@
 package com.microsoft.graph.content;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -19,7 +19,7 @@
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.DefaultSerializer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -110,35 +110,34 @@ public String answer(InvocationOnMock invocation) throws Throwable {
             }
         });
 
-        assertThrows("the number of steps cannot exceed 20", IllegalArgumentException.class, () -> {
+        assertThrows(IllegalArgumentException.class, () -> {
             new MSBatchRequestContent(mock(ILogger.class), null, null, null, null, null, null, null, null, null, null, null, null, null,
                     null, null, null, null, null, null, null, null, null);
-        });
-        assertThrows("the logger cannot be null", NullPointerException.class, () -> {
+        }, "the number of steps cannot exceed 20");
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchRequestContent((ILogger) null, (MSBatchRequestStep)null);
-        });
+        }, "the logger cannot be null");
 
         new MSBatchRequestContent(mockStep, null); // addind a null step doesn't throw
-        assertThrows("should throw argument exception", NullPointerException.class, () -> {
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchRequestContent().addBatchRequestStep(null);
-        });
-        assertThrows("should throw argument exception", NullPointerException.class, () -> {
+        }, "should throw argument exception");
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchRequestContent().addBatchRequestStep((Request) null);
-        });
+        }, "should throw argument exception");
 
-        assertThrows("the number of steps cannot exceed 20", IllegalArgumentException.class, () -> {
+        assertThrows(IllegalArgumentException.class, () -> {
             final MSBatchRequestContent batchContent = new MSBatchRequestContent();
             for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
                 assertNotNull(batchContent.addBatchRequestStep(mock(Request.class)));
             }
             batchContent.addBatchRequestStep(mock(Request.class));
-        });
+        }, "the number of steps cannot exceed 20");
         {
             final MSBatchRequestContent batchContent = new MSBatchRequestContent();
             reservedIds.clear();
             for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
-                assertTrue("item number " + i + " should be added successfully",
-                        batchContent.addBatchRequestStep(mockStep));
+                assertTrue(batchContent.addBatchRequestStep(mockStep), "item number " + i + " should be added successfully");
             }
             assertFalse(batchContent.addBatchRequestStep(mockStep));
         }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
index 259110b08..1e6d7bbf0 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
@@ -1,10 +1,10 @@
 package com.microsoft.graph.content;
 
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Request;
 
@@ -14,23 +14,23 @@ public class MSBatchRequestStepTest {
     public void testMSBatchRequestStepCreation() {
         Request request = new Request.Builder().url("http://graph.microsoft.com").build();
         MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
-        assertTrue("Test BatchRequestStep creation", requestStep != null);
-        assertTrue("Test Request id", requestStep.getRequestId().compareTo("1") == 0);
-        assertTrue("Test Request object", requestStep.getRequest() == request);
-        assertTrue("Test Array of depends on Ids", requestStep.getDependsOnIds() != null);
+        assertTrue(requestStep != null, "Test BatchRequestStep creation");
+        assertTrue(requestStep.getRequestId().compareTo("1") == 0, "Test Request id");
+        assertTrue(requestStep.getRequest() == request, "Test Request object");
+        assertTrue(requestStep.getDependsOnIds() != null, "Test Array of depends on Ids");
     }
 
     @Test
     public void defensiveProgrammingTests() {
-        assertThrows("should throw argument exception", NullPointerException.class, () -> {
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchRequestStep(null, null);
-        });
-        assertThrows("should throw argument exception", NullPointerException.class, () -> {
+        }, "should throw argument exception");
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchRequestStep("id", null);
-        });
-        assertThrows("should throw argument exception", IllegalArgumentException.class, () -> {
+        }, "should throw argument exception");
+        assertThrows(IllegalArgumentException.class, () -> {
             new MSBatchRequestStep("", null);
-        });
+        }, "should throw argument exception");
         new MSBatchRequestStep("id", mock(Request.class));
     }
 
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
index c0ba80fae..eda781691 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
@@ -1,13 +1,13 @@
 package com.microsoft.graph.content;
 
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.MediaType;
 import okhttp3.Protocol;
@@ -20,9 +20,9 @@ public class MSBatchResponseContentTest {
 
     @Test
     public void testNullMSBatchResponseContent() {
-        assertThrows("should throw argument exception", NullPointerException.class, () -> {
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchResponseContent((Response)null);
-        });
+        }, "should throw argument exception");
     }
 
     @Test
@@ -45,9 +45,9 @@ public void testInvalidMSBatchResponseContentWithEmptyResponse() {
 
     @Test
     public void testInvalidMSBatchResponseContentWithNullResponseString() {
-        assertThrows("should throw argument exception", NullPointerException.class, () -> {
+        assertThrows(NullPointerException.class, () -> {
             new MSBatchResponseContent(null);
-        });
+        }, "should throw argument exception");
     }
 
     @Test
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index 3567608c4..a6733a565 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -9,12 +9,12 @@
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -40,7 +40,7 @@ public class BaseClientTests {
     private ILogger mLogger;
     private ISerializer mSerializer;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
         baseClient = new BaseClient();
         mLogger = mock(ILogger.class);
diff --git a/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java b/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java
index cc651a3c4..62b68a7c2 100644
--- a/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/core/ClientExceptionTests.java
@@ -1,17 +1,17 @@
 package com.microsoft.graph.core;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ClientExceptionTests {
 
     private ClientException clientException;
     private String expectMessage = "This is test exception message";
-	
-	@Before
+
+	@BeforeEach
 	public void setUp() throws Exception {
         clientException = new ClientException(expectMessage, null);
 	}
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index f9056400e..ee1c96772 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -2,15 +2,16 @@
 
 import com.google.gson.JsonElement;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.mock;
 
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Request;
 
@@ -155,14 +156,14 @@ public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Res
         assertNotNull(client.getLogger());
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testHttpProviderCannotBeNull() {
-        BaseClient.builder().httpProvider(null);
+        assertThrows(NullPointerException.class, () -> { BaseClient.builder().httpProvider(null); } );
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testLoggerCannotBeNull() {
-        BaseClient.builder().logger(null);
+        assertThrows(NullPointerException.class, () -> { BaseClient.builder().logger(null);});
     }
 
     private static ILogger createLogger() {
diff --git a/src/test/java/com/microsoft/graph/core/MultipartTests.java b/src/test/java/com/microsoft/graph/core/MultipartTests.java
index a1bdacad1..93984601c 100644
--- a/src/test/java/com/microsoft/graph/core/MultipartTests.java
+++ b/src/test/java/com/microsoft/graph/core/MultipartTests.java
@@ -1,9 +1,9 @@
 package com.microsoft.graph.core;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests for Multipart functionality
@@ -12,7 +12,7 @@ public class MultipartTests {
 
 	private Multipart multipart;
 
-	@Before
+	@BeforeEach
     public void setUp() {
 		multipart =  new Multipart();
 	}
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
index eb06d03e5..f1236fa40 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
@@ -2,14 +2,14 @@
 
 import static org.mockito.Mockito.mock;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonObject;
 import com.microsoft.graph.core.IBaseClient;
@@ -25,7 +25,7 @@ public class BaseCollectionPageTests {
     private BaseCollectionPage<String, BaseRequestBuilder<String>> baseCollectionPage;
     private String requestUrl = "https://a.b.c/";
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         list = new ArrayList<String>();
         list.add("Object1");
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
index 2b6e67e53..3b630a7dc 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -10,8 +10,8 @@
 import com.microsoft.graph.options.QueryOption;
 import com.microsoft.graph.serializer.ISerializer;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -24,9 +24,9 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -55,7 +55,7 @@ public class BaseCollectionRequestTests {
                                         mock(BaseCollectionRequestBuilder.class).getClass();
     private BaseEntityCollectionRequest<JsonObject, ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>> mRequest;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         mBaseClient = mock(IBaseClient.class);
         final Response response = new Response.Builder()
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
index 6f7bb83df..56e00b081 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
@@ -1,10 +1,10 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test cases for {@see BaseRequestBuilder}
@@ -14,7 +14,7 @@ public class BaseRequestBuilderTests {
     private String expectedRequestUrl = "https://a.b.c/";
     private BaseRequestBuilder<String> baseRequestBuilder;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         baseRequestBuilder = new BaseRequestBuilder<String>(expectedRequestUrl,null,null){};
     }
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index 45e446be8..535986be7 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -1,10 +1,10 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -14,8 +14,8 @@
 
 import static org.mockito.Mockito.mock;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -42,7 +42,7 @@ public class BaseRequestTests {
     private BaseRequest<JsonObject> mRequest;
     private JsonObject callbackJsonObject;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         final Response response = new Response.Builder()
                 .request(new Request.Builder().url("https://a.b.c").build())
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
index 42d56d7d8..68c0a2329 100644
--- a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -1,17 +1,17 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.ExecutionException;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
 
 import okhttp3.Call;
@@ -37,7 +37,7 @@ public class BaseStreamRequestTests {
 
     private BaseClient mBaseClient;
 
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         mBaseClient = mock(BaseClient.class);
     }
diff --git a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
index 40467a652..5e9309cfc 100644
--- a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
+++ b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
@@ -14,7 +14,7 @@
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -31,10 +31,10 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
diff --git a/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
index 31eb7156d..e32829b47 100644
--- a/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
+++ b/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
@@ -1,11 +1,11 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.mock;
 
 import com.google.gson.JsonPrimitive;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DeltaCollectionPageTests {
     @SuppressWarnings("unchecked")
diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
index e00ebd5f1..3d451081e 100644
--- a/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
@@ -1,8 +1,8 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonObject;
 
diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
index 0d8087e59..bde72f3ff 100644
--- a/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
@@ -1,10 +1,10 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.core.GraphErrorCodes;
 
diff --git a/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
index 898de9e84..998f45569 100644
--- a/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
@@ -1,10 +1,10 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.ArrayList;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class GraphFatalServiceExceptionTests {
 
diff --git a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
index cf0ee86a3..f0942a7bf 100644
--- a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
@@ -1,8 +1,8 @@
 package com.microsoft.graph.http;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -15,7 +15,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.MediaType;
 import okhttp3.Protocol;
diff --git a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
index 3cebd262a..124b3e209 100644
--- a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
+++ b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
@@ -2,7 +2,7 @@
 
 import static org.mockito.Mockito.mock;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonObject;
 import com.microsoft.graph.serializer.ISerializer;
diff --git a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
index e31912d7c..4f77c93e9 100644
--- a/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/AuthenticationHandlerTest.java
@@ -10,7 +10,7 @@
 import java.net.URL;
 import java.util.concurrent.CompletableFuture;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
diff --git a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
index defa43c8f..86ea5f9b2 100644
--- a/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/HttpClientsTest.java
@@ -1,10 +1,10 @@
 package com.microsoft.graph.httpcore;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
diff --git a/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
index ff50a30f5..e6d937d89 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
@@ -1,13 +1,13 @@
 package com.microsoft.graph.httpcore;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.ProtocolException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
 
diff --git a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
index 3a95e98e2..9a805e559 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
@@ -1,14 +1,14 @@
 package com.microsoft.graph.httpcore;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import java.net.HttpURLConnection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.httpcore.middlewareoption.IShouldRetry;
 import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
@@ -151,9 +151,9 @@ public void testGetRetryAfterMaxExceed() {
     }
     @Test
     public void defensiveProgramming() {
-        assertThrows("logger cannot be null", NullPointerException.class, () -> {
+        assertThrows(NullPointerException.class, () -> {
             new RetryHandler(null, mock(RetryOptions.class));
-        });
+        }, "logger cannot be null");
     }
 
     Response TestResponse() {
diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
index ecd827faa..e86be6903 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
@@ -1,13 +1,13 @@
 package com.microsoft.graph.httpcore;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
index 900182dbd..0660094a2 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryOptionsTest.java
@@ -1,9 +1,9 @@
 package com.microsoft.graph.httpcore;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.httpcore.middlewareoption.TelemetryOptions;
 
diff --git a/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java b/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java
index 0e2e09539..394ebb422 100644
--- a/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java
+++ b/src/test/java/com/microsoft/graph/logger/DefaultLoggerTests.java
@@ -1,8 +1,8 @@
 package com.microsoft.graph.logger;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test cases for {@see DefaultLogger}
diff --git a/src/test/java/com/microsoft/graph/options/OptionTests.java b/src/test/java/com/microsoft/graph/options/OptionTests.java
index a83312a77..45f163a5a 100644
--- a/src/test/java/com/microsoft/graph/options/OptionTests.java
+++ b/src/test/java/com/microsoft/graph/options/OptionTests.java
@@ -1,11 +1,11 @@
 package com.microsoft.graph.options;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OptionTests {
 
@@ -27,12 +27,12 @@ public void testOption() {
         assertEquals("o1",option.getName());
         assertEquals("ov1",option.getValue());
 
-        assertThrows("should fail on null name", NullPointerException.class, () -> {
+        assertThrows(NullPointerException.class, () -> {
             new Option(null, "onion");
-        });
-        assertThrows("should fail on empty name", IllegalArgumentException.class, () -> {
+        }, "should fail on null name");
+        assertThrows(IllegalArgumentException.class, () -> {
             new Option("", "onion");
-        });
+        }, "should fail on empty name");
     }
 
 }
diff --git a/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java b/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java
index 75909dceb..179d39889 100644
--- a/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java
+++ b/src/test/java/com/microsoft/graph/serializer/ByteArraySerializerTests.java
@@ -1,9 +1,9 @@
 package com.microsoft.graph.serializer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ByteArraySerializerTests {
 
diff --git a/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java b/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java
index 3030d4253..ad9d9b20d 100644
--- a/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java
+++ b/src/test/java/com/microsoft/graph/serializer/DateOnlyTests.java
@@ -1,8 +1,8 @@
 package com.microsoft.graph.serializer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.core.DateOnly;
 
diff --git a/src/test/java/com/microsoft/graph/serializer/DurationTests.java b/src/test/java/com/microsoft/graph/serializer/DurationTests.java
index a6d553b17..c691754b6 100644
--- a/src/test/java/com/microsoft/graph/serializer/DurationTests.java
+++ b/src/test/java/com/microsoft/graph/serializer/DurationTests.java
@@ -1,11 +1,11 @@
 package com.microsoft.graph.serializer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class DurationTests {
 
diff --git a/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java b/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java
index 738f8c614..ed8e45eac 100644
--- a/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java
+++ b/src/test/java/com/microsoft/graph/serializer/ISO8601Test.java
@@ -1,13 +1,13 @@
 package com.microsoft.graph.serializer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ISO8601Test {
 
diff --git a/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java b/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java
index e1bdcfd54..9480a36ba 100644
--- a/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java
+++ b/src/test/java/com/microsoft/graph/serializer/OffsetDateTimeSerializerTests.java
@@ -1,14 +1,14 @@
 package com.microsoft.graph.serializer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.TimeZone;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test cases for offsetDateTime serialization and deserialization
diff --git a/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java b/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java
index 35ccf0f5e..8a3f6234e 100644
--- a/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java
+++ b/src/test/java/com/microsoft/graph/serializer/TimeOfDayTests.java
@@ -1,8 +1,8 @@
 package com.microsoft.graph.serializer;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.core.TimeOfDay;
 

From 30cdf54ffb6b0d0e21ca973b02ed8b262546d6cf Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 29 Jan 2021 13:47:53 -0500
Subject: [PATCH 157/213] - upgrades dependencies

---
 gradle/dependencies.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 04eaae9e5..d24425227 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -6,8 +6,8 @@ dependencies {
     
     api 'com.squareup.okhttp3:okhttp:4.9.0'
 
-    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.google.guava:guava:30.1-jre'
 
     implementation 'com.google.code.gson:gson:2.8.6'
-    api 'com.azure:azure-identity:1.2.0'
+    api 'com.azure:azure-identity:1.2.2'
 }
\ No newline at end of file

From 94da5ba5d921a71afeb9593307ea8ae1d2fe08fa Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 29 Jan 2021 13:55:38 -0500
Subject: [PATCH 158/213] - updates POM to match dependencies for github dep
 tree

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed1c9c54a..ab13c6131 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>29.0-jre</version>
+			<version>30.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>

From 386588a6648dbfc10c594d5d0ac178f3bcaa19b3 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 1 Feb 2021 10:11:50 -0500
Subject: [PATCH 159/213] - upgrades ok http to latest

---
 gradle/dependencies.gradle | 2 +-
 pom.xml                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index d24425227..c5effbd93 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -4,7 +4,7 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
     testImplementation 'org.mockito:mockito-inline:3.7.7'
     
-    api 'com.squareup.okhttp3:okhttp:4.9.0'
+    api 'com.squareup.okhttp3:okhttp:4.9.1'
 
     implementation 'com.google.guava:guava:30.1-jre'
 
diff --git a/pom.xml b/pom.xml
index ab13c6131..235483938 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>gson</artifactId>
-			<version>4.9.0</version>
+			<version>4.9.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.azure</groupId>

From 918129d2212f84c6fbef89a4a5efd24abce7cee5 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 1 Feb 2021 16:35:02 -0500
Subject: [PATCH 160/213] - add a method on the client to execute batches -
 replaces older, native client dependent implementation by a new
 implementation for batches

---
 .../microsoft/graph/content/BatchRequest.java |  74 +++++
 .../graph/content/BatchRequestBuilder.java    |  66 ++++
 .../graph/content/BatchRequestContent.java    | 125 +++++++
 .../graph/content/BatchRequestStep.java       |  46 +++
 .../graph/content/BatchResponseContent.java   |  51 +++
 .../graph/content/BatchResponseStep.java      |  33 ++
 .../microsoft/graph/content/BatchStep.java    |  48 +++
 .../graph/content/MSBatchRequestContent.java  | 242 --------------
 .../graph/content/MSBatchRequestStep.java     |  62 ----
 .../graph/content/MSBatchResponseContent.java | 310 ------------------
 .../com/microsoft/graph/core/BaseClient.java  |  12 +-
 .../com/microsoft/graph/core/IBaseClient.java |   8 +
 .../content/BatchRequestContentTest.java      | 198 +++++++++++
 ...est.java => BatchResponseContentTest.java} | 112 +++----
 .../content/MSBatchRequestContentTest.java    | 201 ------------
 .../graph/content/MSBatchRequestStepTest.java |  37 ---
 16 files changed, 704 insertions(+), 921 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchRequest.java
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchRequestContent.java
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchRequestStep.java
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchResponseContent.java
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchResponseStep.java
 create mode 100644 src/main/java/com/microsoft/graph/content/BatchStep.java
 delete mode 100644 src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
 delete mode 100644 src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
 delete mode 100644 src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
 create mode 100644 src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
 rename src/test/java/com/microsoft/graph/content/{MSBatchResponseContentTest.java => BatchResponseContentTest.java} (66%)
 delete mode 100644 src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
 delete mode 100644 src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequest.java b/src/main/java/com/microsoft/graph/content/BatchRequest.java
new file mode 100644
index 000000000..d8fbfb851
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchRequest.java
@@ -0,0 +1,74 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.content;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequest;
+import com.microsoft.graph.http.HttpMethod;
+import com.microsoft.graph.options.Option;
+
+/** Request for batch requests */
+public class BatchRequest extends BaseRequest<BatchResponseContent> {
+
+    /**
+     * Instantiates a new batch request
+     *
+     * @param requestUrl the URL to send the request to
+     * @param client the client to use to execute the request
+     * @param options the options to apply to the request
+     */
+    public BatchRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nonnull final List<? extends Option> options) {
+        super(requestUrl, client, options, BatchResponseContent.class);
+    }
+
+    /**
+     * Send this request
+     *
+     * @return the response object
+     * @param content content of the batch request to execute
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected BatchResponseContent post(@Nonnull final BatchRequestContent content) throws ClientException {
+        this.setHttpMethod(HttpMethod.POST);
+        return this.getClient().getHttpProvider().send(this, BatchResponseContent.class, content);
+    }
+    /**
+     * Send this request
+     *
+     * @return the response object
+     * @param content content of the batch request to execute
+     * @throws ClientException an exception occurs if there was an error while the request was sent
+     */
+    @Nullable
+    protected java.util.concurrent.CompletableFuture<BatchResponseContent> postAsync(@Nonnull final BatchRequestContent content) throws ClientException {
+        this.setHttpMethod(HttpMethod.POST);
+        return this.getClient().getHttpProvider().sendAsync(this, BatchResponseContent.class, content);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java b/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java
new file mode 100644
index 000000000..731dfd9aa
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java
@@ -0,0 +1,66 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.content;
+
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.BaseRequestBuilder;
+import com.microsoft.graph.options.Option;
+
+/** Request builder for batch requests */
+public class BatchRequestBuilder extends BaseRequestBuilder<BatchResponseContent> {
+    /**
+     * Instantiates a new batch request builder
+     * @param requestUrl the URL for the request
+     * @param client the client to use to execute the request
+     * @param options the request options
+     */
+    public BatchRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nonnull final List<? extends Option> options) {
+        super(requestUrl, client, options);
+    }
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    @Nonnull
+    public BatchRequest buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
+        return buildRequest(getOptions(requestOptions));
+    }
+
+    /**
+     * Creates the request
+     *
+     * @param requestOptions the options for this request
+     * @return the IUserRequest instance
+     */
+    @Nonnull
+    public BatchRequest buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
+        return new BatchRequest(this.getRequestUrl(), getClient(), requestOptions);
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
new file mode 100644
index 000000000..5a2cb5612
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
@@ -0,0 +1,125 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.content;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.microsoft.graph.http.HttpMethod;
+import com.microsoft.graph.http.IHttpRequest;
+import com.microsoft.graph.options.HeaderOption;
+
+public class BatchRequestContent {
+    @Expose
+    @SerializedName("requests")
+    public List<BatchRequestStep<?>> requests;
+
+    @Nonnull
+    public String addBatchRequestStep(@Nonnull final IHttpRequest request) {
+        Objects.requireNonNull(request, "request parameter cannot be null");
+        return addBatchRequestStep(request, request.getHttpMethod() == null ? HttpMethod.GET : request.getHttpMethod());
+    }
+    @Nonnull
+    public String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod) {
+        return addBatchRequestStep(request, httpMethod, null);
+    }
+    @Nonnull
+    public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody) {
+        return addBatchRequestStep(request, httpMethod, serializableBody, null);
+    }
+    public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final HashSet<String> dependsOnRequestsIds) {
+        Objects.requireNonNull(request, "request parameter cannot be null");
+        Objects.requireNonNull(httpMethod, "httpMethod parameter cannot be null");
+        if(dependsOnRequestsIds != null)
+            for(final String id : dependsOnRequestsIds) {
+                if(getStepById(id) == null)
+                    throw new IllegalArgumentException("the current request depends on a inexisting request");
+            }
+
+        if(requests == null)
+            requests = new ArrayList<>();
+
+        final Matcher protocolAndHostReplacementMatcher = protocolAndHostReplacementPattern.matcher(request.getRequestUrl().toString());
+        final BatchRequestStep<T> step = new BatchRequestStep<T>() {{
+            url = protocolAndHostReplacementMatcher.replaceAll("");
+            body = serializableBody;
+            method = httpMethod;
+            dependsOn = dependsOnRequestsIds;
+            id = getNextRequestId();
+        }};
+
+        if(!request.getHeaders().isEmpty()) {
+            step.headers = new HashMap<>();
+            for(final HeaderOption headerOption : request.getHeaders())
+                step.headers.putIfAbsent(headerOption.getName(), headerOption.getValue().toString());
+        }
+        requests.add(step);
+        return step.id;
+    }
+    public void removeBatchRequestStepWithId(@Nonnull final String ...stepIds) {
+        if(requests == null) return;
+
+        for(final String stepId : stepIds) {
+            Objects.requireNonNull(stepId, "parameter stepIds cannot contain null values");
+            requests.removeIf(x -> x.id == stepId);
+            for(final BatchRequestStep<?> step : requests) {
+                if(step.dependsOn != null) {
+                    step.dependsOn.removeIf(x -> x == stepId);
+                    if(step.dependsOn.isEmpty())
+                        step.dependsOn = null; // so we don't send dependsOn: [] over the wire
+                }
+            }
+        }
+    }
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public <T> BatchRequestStep<T> getStepById(@Nonnull final String stepId) {
+        Objects.requireNonNull(stepId, "parameter stepId cannot be null");
+        if(requests == null) return null;
+
+        for(final BatchRequestStep<?> step : requests) {
+            if(stepId.equals(step.id))
+                return (BatchRequestStep<T>)step;
+        }
+        return null;
+    }
+    private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
+    private String getNextRequestId() {
+        String requestId;
+        do {
+            requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
+        } while(getStepById(requestId) != null);
+        return requestId;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
new file mode 100644
index 000000000..22b2521ec
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
@@ -0,0 +1,46 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.content;
+
+import java.util.HashSet;
+
+import javax.annotation.Nullable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.microsoft.graph.http.HttpMethod;
+
+/** the http request for the batch step */
+public class BatchRequestStep<T> extends BatchStep<T> {
+    /** The URL to query for the step */
+    @Nullable
+    @Expose
+    @SerializedName("url")
+    public String url;
+    @Expose
+    @SerializedName("method")
+    public HttpMethod method;
+    @Expose
+    @SerializedName("dependsOn")
+    public HashSet<String> dependsOn;
+}
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
new file mode 100644
index 000000000..85e2660e9
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
@@ -0,0 +1,51 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.content;
+
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class BatchResponseContent {
+    @Expose
+    @SerializedName("responses")
+    public List<BatchResponseStep<?>> responses;
+
+    @Nullable
+    @SuppressWarnings("unchecked")
+    public <T> BatchResponseStep<T> getResponseById(@Nonnull final String stepId) {
+        Objects.requireNonNull(stepId, "parameter stepId cannot be null");
+        if(responses == null) return null;
+
+        for(final BatchResponseStep<?> step : responses) {
+            if(stepId.equals(step.id))
+                return (BatchResponseStep<T>)step;
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
new file mode 100644
index 000000000..60e513ead
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
@@ -0,0 +1,33 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+package com.microsoft.graph.content;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/** Response for the batch step */
+public class BatchResponseStep<T> extends BatchStep<T> {
+    /** Http status code of the response */
+    @Expose
+    @SerializedName("status")
+    public int status;
+}
diff --git a/src/main/java/com/microsoft/graph/content/BatchStep.java b/src/main/java/com/microsoft/graph/content/BatchStep.java
new file mode 100644
index 000000000..b35c24821
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/content/BatchStep.java
@@ -0,0 +1,48 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) 2021 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
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.content;
+
+import java.util.HashMap;
+
+import javax.annotation.Nullable;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/** Common abstractions between batch request steps and batch response steps */
+public abstract class BatchStep<T> {
+    /** The Id of the step */
+    @Expose
+    @Nullable
+    @SerializedName("id")
+    public String id;
+    /** The request/response headers for the step */
+    @Expose
+    @Nullable
+    @SerializedName("headers")
+    public HashMap<String, String> headers;
+    /** The body of request/response for the step */
+    @Expose
+    @SerializedName("body")
+    public T body;
+}
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
deleted file mode 100644
index 013f47509..000000000
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestContent.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.microsoft.graph.content;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.logger.DefaultLogger;
-import com.microsoft.graph.logger.ILogger;
-import com.google.gson.JsonParseException;
-
-import okhttp3.Headers;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okio.Buffer;
-
-/**
- * Represents the content of a batch request
- */
-public class MSBatchRequestContent {
-    private final LinkedHashMap<String, MSBatchRequestStep> batchRequestStepsHashMap;
-
-    /**
-     * Maximum number of requests that can be sent in a batch
-     */
-    public static final int MAX_NUMBER_OF_REQUESTS = 20;
-    private final ILogger logger;
-
-    /**
-     * Creates Batch request content using list provided
-     *
-     * @param batchRequestStepsArray List of batch steps for batching
-     */
-    public MSBatchRequestContent(@Nonnull final MSBatchRequestStep... batchRequestStepsArray) {
-        this(new DefaultLogger(), batchRequestStepsArray);
-    }
-
-    /**
-     * Creates Batch request content using list provided
-     *
-     * @param batchRequestStepsArray List of batch steps for batching
-     * @param logger logger to use for telemetry
-     */
-    public MSBatchRequestContent(@Nonnull final ILogger logger, @Nonnull final MSBatchRequestStep... batchRequestStepsArray) {
-        if (batchRequestStepsArray.length > MAX_NUMBER_OF_REQUESTS)
-            throw new IllegalArgumentException("Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
-
-        this.logger = Objects.requireNonNull(logger, "logger cannot be null");
-
-        this.batchRequestStepsHashMap = new LinkedHashMap<>();
-        for (final MSBatchRequestStep requestStep : batchRequestStepsArray)
-            if(requestStep != null)
-                addBatchRequestStep(requestStep);
-    }
-
-    /**
-     * Adds a step to the current batch
-     * @param batchRequestStep Batch request step adding to batch content
-     * @return true or false based on addition or no addition of batch request step
-     * given
-     */
-    public boolean addBatchRequestStep(@Nonnull final MSBatchRequestStep batchRequestStep) {
-        Objects.requireNonNull(batchRequestStep, "batchRequestStep parameter cannot be null");
-        if (batchRequestStepsHashMap.containsKey(batchRequestStep.getRequestId()) ||
-            batchRequestStepsHashMap.size() >= MAX_NUMBER_OF_REQUESTS)
-            return false;
-        batchRequestStepsHashMap.put(batchRequestStep.getRequestId(), batchRequestStep);
-        return true;
-    }
-
-    /**
-     * Add steps to batch from OkHttp.Request
-     * @param request the request to add to the batch
-     * @param arrayOfDependsOnIds ids of steps this step depends on
-     * @return the step id
-     */
-    @Nonnull
-    public String addBatchRequestStep(@Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
-        Objects.requireNonNull(request, "request parameter cannot be null");
-        String requestId;
-        do {
-            requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
-        } while(batchRequestStepsHashMap.keySet().contains(requestId));
-        if(addBatchRequestStep(new MSBatchRequestStep(requestId, request, arrayOfDependsOnIds)))
-            return requestId;
-        else
-            throw new IllegalArgumentException("unable to add step to batch. Number of batch request steps cannot exceed " + MAX_NUMBER_OF_REQUESTS);
-    }
-
-    /**
-     * @param requestId Id of Batch request step to be removed
-     *
-     * @return true or false based on removal or no removal of batch request step
-     * with given id
-     */
-    public boolean removeBatchRequestStepWithId(@Nonnull final String requestId) {
-        boolean removed = false;
-        if (batchRequestStepsHashMap.containsKey(requestId)) {
-            batchRequestStepsHashMap.remove(requestId);
-            removed = true;
-            for (final Map.Entry<String, MSBatchRequestStep> steps : batchRequestStepsHashMap.entrySet()) {
-                if (steps.getValue() != null && steps.getValue().getDependsOnIds() != null) {
-                    while (steps.getValue().getDependsOnIds().remove(requestId))
-                        ;
-                }
-            }
-        }
-        return removed;
-    }
-
-    private JsonObject getBatchRequestContentAsJson() {
-        final JsonObject batchRequestContentMap = new JsonObject();
-        final JsonArray batchContentArray = new JsonArray();
-        for (final Map.Entry<String, MSBatchRequestStep> requestStep : batchRequestStepsHashMap.entrySet()) {
-            batchContentArray.add(getBatchRequestObjectFromRequestStep(requestStep.getValue()));
-        }
-        batchRequestContentMap.add("requests", batchContentArray);
-        return batchRequestContentMap;
-    }
-    /**
-     * @return Batch request content's json as String
-     */
-    @Nonnull
-    public String getBatchRequestContent() {
-        return getBatchRequestContentAsJson().toString();
-    }
-
-    /**
-     * Executes the batch requests and returns the response
-     * @param client client to use for the request
-     * @return the batch response
-     * @throws ClientException when the batch couldn't be executed because of client issues.
-     */
-    @Nonnull
-    public MSBatchResponseContent execute(@Nonnull final IBaseClient client) {
-        final JsonObject content = getBatchRequestContentAsJson();
-        return new MSBatchResponseContent(logger, client.getServiceRoot() + "/",
-                                        content,
-                                        client.customRequest("/$batch")
-                                                .buildRequest()
-                                                .post(content)
-                                                .getAsJsonObject());
-    }
-    /**
-     * Executes the batch requests asynchronously and returns the response
-     * @param client client to use for the request
-     * @return a future with the batch response
-     */
-    @Nonnull
-    public CompletableFuture<MSBatchResponseContent> executeAsync(@Nonnull final IBaseClient client) {
-        Objects.requireNonNull(client, "client parameter cannot be null");
-        final JsonObject content = getBatchRequestContentAsJson();
-        return client.customRequest("/$batch")
-            .buildRequest()
-            .postAsync(content)
-            .thenApply(resp -> new MSBatchResponseContent(logger, client.getServiceRoot() + "/", content, resp.getAsJsonObject()));
-    }
-
-    private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
-    private JsonObject getBatchRequestObjectFromRequestStep(final MSBatchRequestStep batchRequestStep) {
-        final JsonObject contentmap = new JsonObject();
-        contentmap.add("id", new JsonPrimitive(batchRequestStep.getRequestId()));
-
-        final Matcher protocolAndHostReplacementMatcher = protocolAndHostReplacementPattern.matcher(batchRequestStep.getRequest().url().toString());
-
-        final String url =  protocolAndHostReplacementMatcher.replaceAll("");
-        contentmap.add("url", new JsonPrimitive(url));
-
-        contentmap.add("method", new JsonPrimitive(batchRequestStep.getRequest().method().toString()));
-
-        final Headers headers = batchRequestStep.getRequest().headers();
-        if (headers != null && headers.size() != 0) {
-            final JsonObject headerMap = new JsonObject();
-            for (final Map.Entry<String, List<String>> entry : headers.toMultimap().entrySet()) {
-                headerMap.add(entry.getKey(), new JsonPrimitive(getHeaderValuesAsString(entry.getValue())));
-            }
-            contentmap.add("headers", headerMap);
-        }
-
-        final HashSet<String> arrayOfDependsOnIds = batchRequestStep.getDependsOnIds();
-        if (arrayOfDependsOnIds != null) {
-            final JsonArray array = new JsonArray(arrayOfDependsOnIds.size());
-            for (final String dependsOnId : arrayOfDependsOnIds)
-                array.add(dependsOnId);
-            contentmap.add("dependsOn", array);
-        }
-
-        final RequestBody body = batchRequestStep.getRequest().body();
-        if (body != null) {
-            try {
-                contentmap.add("body", requestBodyToJSONObject(batchRequestStep.getRequest()));
-            } catch (IOException | JsonParseException e) {
-                logger.logError("error pasing the request JSON body", e);
-            }
-        }
-        return contentmap;
-    }
-
-    private String getHeaderValuesAsString(final List<String> list) {
-        if (list == null || list.size() == 0)
-            return "";
-        final StringBuilder builder = new StringBuilder(list.get(0));
-        for (int i = 1; i < list.size(); i++) {
-            builder.append(";");
-            builder.append(list.get(i));
-        }
-        return builder.toString();
-    }
-
-    private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
-        if (request == null || request.body() == null)
-            return null;
-        final Request copy = request.newBuilder().build();
-        final Buffer buffer = new Buffer();
-        copy.body().writeTo(buffer);
-        final String requestBody = buffer.readUtf8();
-        if(requestBody == null || requestBody == "")
-            return null;
-        final JsonElement requestBodyElement = JsonParser.parseString(requestBody);
-        if(requestBodyElement == null || !requestBodyElement.isJsonObject())
-            return null;
-        else
-            return requestBodyElement.getAsJsonObject();
-    }
-
-}
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java b/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
deleted file mode 100644
index edb36b9d7..000000000
--- a/src/main/java/com/microsoft/graph/content/MSBatchRequestStep.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.microsoft.graph.content;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-import okhttp3.Request;
-
-/**
- * Respresents a step in a batch request
- */
-public class MSBatchRequestStep {
-    private String requestId;
-    private Request request;
-    private HashSet<String> dependsOnIds;
-
-    /**
-     * Initializes a batch step from a raw HTTP request
-     * @param requestId the id to assign to this step
-     * @param request the request to send in the batch
-     * @param arrayOfDependsOnIds the ids of steps this step depends on
-     */
-    public MSBatchRequestStep(@Nonnull final String requestId, @Nonnull final Request request, @Nullable final String... arrayOfDependsOnIds) {
-        Objects.requireNonNull(requestId, "Request Id cannot be null.");
-        if(requestId.isEmpty())
-            throw new IllegalArgumentException("Request Id cannot be empty.");
-
-        this.requestId = requestId;
-        this.request = Objects.requireNonNull(request, "Request cannot be null.");
-        this.dependsOnIds = new HashSet<>(Arrays.asList(arrayOfDependsOnIds));
-    }
-
-    /**
-     * Gets the current step ID
-     * @return the current step ID
-     */
-    @Nonnull
-    public String getRequestId() {
-        return requestId;
-    }
-
-    /**
-     * Gets the raw HTTP request representation for the step
-     * @return the raw HTTP request representation for the step
-     */
-    @Nonnull
-    public Request getRequest() {
-        return request;
-    }
-
-    /**
-     * Gets the list of steps this step depends on
-     * @return the list of steps this step depends on
-     */
-    @Nullable
-    public HashSet<String> getDependsOnIds(){
-        return dependsOnIds;
-    }
-}
diff --git a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java b/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
deleted file mode 100644
index 9bdb8d242..000000000
--- a/src/main/java/com/microsoft/graph/content/MSBatchResponseContent.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package com.microsoft.graph.content;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
-import javax.annotation.Nonnull;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.microsoft.graph.logger.DefaultLogger;
-import com.microsoft.graph.logger.ILogger;
-import com.google.gson.JsonParseException;
-
-import okhttp3.MediaType;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-
-/**
- * Represents the response of a batch request
- */
-public class MSBatchResponseContent {
-
-    private final Protocol protocol;
-    private final String message;
-    private LinkedHashMap<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
-    private JsonArray batchResponseArray;
-    private String nextLink;
-    private final ILogger logger;
-
-    /**
-     * @param batchResponse OkHttp batch response on execution of batch requests
-     */
-    public MSBatchResponseContent(@Nullable final Response batchResponse) {
-        this(new DefaultLogger(), batchResponse);
-    }
-
-    /**
-     * @param batchResponse OkHttp batch response on execution of batch requests
-     * @param logger logger to use for telemetry
-     */
-    public MSBatchResponseContent(@Nonnull final ILogger logger, @Nullable final Response batchResponse) {
-        this.logger = Objects.requireNonNull(logger, "logger parameter cannot be null");
-        update(batchResponse);
-        this.message = batchResponse.message();
-        this.protocol = batchResponse.protocol();
-    }
-    /**
-     * instantiates a new response
-     * internal only, used when the content executes the requests
-     * @param baseUrl the base service URL without a trailing slash
-     * @param batchRequestData the batch request payload data as a JSON string
-     * @param batchResponseData the batch response body as a JSON string
-     * @param logger logger to use for telemetry
-     */
-    protected MSBatchResponseContent(@Nonnull final ILogger logger, @Nonnull final String baseUrl, @Nonnull final JsonObject batchRequestData, @Nonnull final JsonObject batchResponseData) {
-        this.logger = logger;
-        this.protocol = Protocol.HTTP_1_1;
-        this.message = "OK";
-        final Map<String, Request> requestMap = createBatchRequestsHashMap(baseUrl, batchRequestData);
-        if (requestMap != null)
-            batchRequestsHashMap.putAll(requestMap);
-        updateFromResponseBody(batchResponseData);
-    }
-
-    /**
-     * Returns OkHttp Response of given request Id
-     *
-     * @param requestId Request Id of batch step
-     *
-     * @return OkHttp Response corresponding to requestId
-     */
-    @Nullable
-    public Response getResponseById(@Nonnull final String requestId) {
-        if (batchResponseArray == null)
-            return null;
-
-        final JsonArray responses = batchResponseArray;
-
-        for (final JsonElement response : responses) {
-            if(!response.isJsonObject())
-                continue;
-            final JsonObject jsonresponse = response.getAsJsonObject();
-            final JsonElement idElement = jsonresponse.get("id");
-            if (idElement != null && idElement.isJsonPrimitive()) {
-                final String id = idElement.getAsString();
-                if (id.compareTo(requestId) == 0) {
-                    final Response.Builder builder = new Response.Builder();
-
-                    // Put corresponding request into the constructed response
-                    builder.request(batchRequestsHashMap.get(requestId));
-                    // copy protocol and message same as of batch response
-                    builder.protocol(protocol);
-                    builder.message(message);
-
-                    // Put status code of the corresponding request in JsonArray
-                    final JsonElement statusElement = jsonresponse.get("status");
-                    if (statusElement != null && statusElement.isJsonPrimitive()) {
-                        builder.code(statusElement.getAsInt());
-                    }
-
-                    // Put body from response array for corresponding id into constructing response
-                    final JsonElement jsonBodyElement = jsonresponse.get("body");
-                    if (jsonBodyElement != null && jsonBodyElement.isJsonObject()) {
-                        final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
-                        final String bodyAsString = JsonObject.toString();
-                        final ResponseBody responseBody = ResponseBody
-                                .create(bodyAsString, MediaType.parse("application/json; charset=utf-8"));
-                        builder.body(responseBody);
-                    }
-
-                    // Put headers from response array for corresponding id into constructing
-                    // response
-                    final JsonElement jsonheadersElement = jsonresponse.get("headers");
-                    if (jsonheadersElement != null && jsonheadersElement.isJsonObject()) {
-                        final JsonObject jsonheaders = jsonheadersElement.getAsJsonObject();
-                        for (final String key : jsonheaders.keySet()) {
-                            final JsonElement strValueElement = jsonheaders.get(key);
-                            if (strValueElement != null && strValueElement.isJsonPrimitive()) {
-                                final String strvalue = strValueElement.getAsString();
-                                for (final String value : strvalue.split(";")) {
-                                    builder.header(key, value);
-                                }
-                            }
-                        }
-                    }
-                    return builder.build();
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get map of id and responses
-     *
-     * @return responses in Map of id and response
-     */
-    @Nonnull
-    public Map<String, Response> getResponses() {
-        if (batchResponseArray == null)
-            return null;
-        final Map<String, Response> responsesMap = new LinkedHashMap<>();
-        for (final String id : batchRequestsHashMap.keySet()) {
-            responsesMap.put(id, getResponseById(id));
-        }
-        return responsesMap;
-    }
-
-    /**
-     * Get iterator over the responses
-     *
-     * @return iterator for responses
-     */
-    @Nullable
-    public Iterator<Map.Entry<String, Response>> getResponsesIterator() {
-        final Map<String, Response> responsesMap = getResponses();
-        return responsesMap != null ? responsesMap.entrySet().iterator() : null;
-    }
-
-    /**
-     * Updates the response content using the raw http response object
-     * @param batchResponse the response from the service.
-     */
-    public void update(@Nonnull final Response batchResponse) {
-        final Map<String, Request> requestMap = createBatchRequestsHashMap(Objects.requireNonNull(batchResponse, "Batch Response cannot be null"));
-        if (requestMap != null)
-            batchRequestsHashMap.putAll(requestMap);
-
-        if (batchResponse.body() != null) {
-            try {
-                final String batchResponseData = batchResponse.body().string();
-                if (batchResponseData != null) {
-                    updateFromResponseBody(stringToJSONObject(batchResponseData));
-                }
-            } catch (final IOException e) {
-                logger.logError("error updating batch response content from response body", e);
-            }
-        }
-    }
-    private void updateFromResponseBody(@Nonnull final JsonObject batchResponseObj) {
-        if (batchResponseObj != null) {
-            final JsonElement nextLinkElement = batchResponseObj.get("@odata.nextLink");
-            if (nextLinkElement != null && nextLinkElement.isJsonPrimitive())
-                nextLink = nextLinkElement.getAsString();
-
-            if (batchResponseArray == null)
-                batchResponseArray = new JsonArray();
-
-            final JsonElement responseArrayElement = batchResponseObj.get("responses");
-            if (responseArrayElement != null && responseArrayElement.isJsonArray()) {
-                final JsonArray responseArray = responseArrayElement.getAsJsonArray();
-                batchResponseArray.addAll(responseArray);
-            }
-        }
-    }
-
-    /**
-     * @return nextLink of batch response
-     */
-    @Nullable
-    public String nextLink() {
-        return nextLink;
-    }
-
-    private Map<String, Request> createBatchRequestsHashMap(final Response batchResponse) {
-        if (batchResponse == null)
-            return null;
-        try {
-            final JsonObject requestJSONObject = requestBodyToJSONObject(batchResponse.request());
-            final String baseUrl = batchResponse.request().url().toString().replace("$batch", "");
-            return createBatchRequestsHashMap(baseUrl, requestJSONObject);
-        } catch (IOException ex) {
-            logger.logError("error parsing batch requests to get batch response content", ex);
-            return null;
-        }
-    }
-    private Map<String, Request> createBatchRequestsHashMap(@Nonnull final String baseUrl, @Nonnull final JsonObject requestJSONObject) {
-        if(baseUrl == null || baseUrl == "" || requestJSONObject == null) {
-            return null;
-        }
-        try {
-            final Map<String, Request> batchRequestsHashMap = new LinkedHashMap<>();
-            final JsonElement requestArrayElement = requestJSONObject.get("requests");
-            if (requestArrayElement != null && requestArrayElement.isJsonArray()) {
-                final JsonArray requestArray = requestArrayElement.getAsJsonArray();
-                for (final JsonElement item : requestArray) {
-                    if(!item.isJsonObject())
-                        continue;
-                    final JsonObject requestObject = item.getAsJsonObject();
-
-                    final Request.Builder builder = new Request.Builder();
-
-                    final JsonElement urlElement = requestObject.get("url");
-                    if (urlElement != null && urlElement.isJsonPrimitive()) {
-                        final StringBuilder fullUrl = new StringBuilder(baseUrl);
-                        fullUrl.append(urlElement.getAsString());
-                        builder.url(fullUrl.toString());
-                    }
-                    final JsonElement jsonHeadersElement = requestObject.get("headers");
-                    if (jsonHeadersElement != null && jsonHeadersElement.isJsonObject()) {
-                        final JsonObject jsonheaders = jsonHeadersElement.getAsJsonObject();
-                        for (final String key : jsonheaders.keySet()) {
-                            final JsonElement strvalueElement = jsonheaders.get(key);
-                            if (strvalueElement != null && strvalueElement.isJsonPrimitive()) {
-                                final String strvalue = strvalueElement.getAsString();
-                                for (final String value : strvalue.split("; ")) {
-                                    builder.header(key, value);
-                                }
-                            }
-                        }
-                    }
-                    final JsonElement jsonBodyElement = requestObject.get("body");
-                    final JsonElement jsonMethodElement = requestObject.get("method");
-                    if (jsonBodyElement != null && jsonMethodElement != null
-                        && jsonBodyElement.isJsonObject() && jsonMethodElement.isJsonPrimitive()) {
-                        final JsonObject JsonObject = jsonBodyElement.getAsJsonObject();
-                        final String bodyAsString = JsonObject.toString();
-                        final RequestBody requestBody = RequestBody
-                                .create(bodyAsString, MediaType.parse("application/json; charset=utf-8"));
-                        builder.method(jsonMethodElement.getAsString(), requestBody);
-                    } else if (jsonMethodElement != null) {
-                        builder.method(jsonMethodElement.getAsString(), null);
-                    }
-                    final JsonElement jsonIdElement = requestObject.get("id");
-                    if (jsonIdElement != null && jsonIdElement.isJsonPrimitive()) {
-                        batchRequestsHashMap.put(jsonIdElement.getAsString(), builder.build());
-                    }
-                }
-            }
-            return batchRequestsHashMap;
-
-        } catch (JsonParseException e) {
-            logger.logError("error parsing batch request", e);
-        }
-        return null;
-    }
-
-    private JsonObject stringToJSONObject(final String input) {
-        JsonObject JsonObject = null;
-        try {
-            if (input != null) {
-                JsonObject = JsonParser.parseString(input).getAsJsonObject();
-            }
-        } catch (final Exception e) {
-            logger.logError("error parsing input into JSONObject", e);
-        }
-        return JsonObject;
-    }
-
-    private JsonObject requestBodyToJSONObject(final Request request) throws IOException, JsonParseException {
-        if (request == null || request.body() == null)
-            return null;
-        final Request copy = request.newBuilder().build();
-        final Buffer buffer = new Buffer();
-        copy.body().writeTo(buffer);
-        final String requestBody = buffer.readUtf8();
-        final JsonObject JsonObject = JsonParser.parseString(requestBody).getAsJsonObject();
-        return JsonObject;
-    }
-}
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index bcf49d951..d9e4e22fe 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -27,6 +27,7 @@
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.httpcore.HttpClients;
 import com.microsoft.graph.authentication.IAuthenticationProvider;
+import com.microsoft.graph.content.BatchRequestBuilder;
 import com.microsoft.graph.logger.DefaultLogger;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.DefaultSerializer;
@@ -99,7 +100,16 @@ public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Non
 	public CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url) {
 		return new CustomRequestBuilder<JsonElement>(getServiceRoot() + url, this, null,
 				JsonElement.class);
-	}
+    }
+
+    /**
+     * Get the batch request builder.
+     * @return a request builder to execute a batch.
+     */
+    @Nonnull
+    public BatchRequestBuilder batch() {
+        return new BatchRequestBuilder(getServiceRoot() + "/$batch", this, null);
+    }
 
 	/**
 	 * Gets the builder to start configuring the client
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index 9941f6417..ec49764d7 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -26,6 +26,7 @@
 import javax.annotation.Nonnull;
 
 import com.google.gson.JsonElement;
+import com.microsoft.graph.content.BatchRequestBuilder;
 import com.microsoft.graph.http.IHttpProvider;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.ISerializer;
@@ -93,6 +94,13 @@ public interface IBaseClient {
     @Nonnull
     CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url);
 
+    /**
+     * Get the batch request builder.
+     * @return a request builder to execute a batch.
+     */
+    @Nonnull
+    public BatchRequestBuilder batch();
+
     /**
      * Gets the service SDK version if the service SDK is in use, null otherwise
      * @return the service SDK version if the service SDK is in use, null otherwise
diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
new file mode 100644
index 000000000..54238abe7
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
@@ -0,0 +1,198 @@
+package com.microsoft.graph.content;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.concurrent.ThreadLocalRandom;
+
+import com.google.gson.JsonParser;
+import com.microsoft.graph.authentication.IAuthenticationProvider;
+import com.microsoft.graph.core.BaseClient;
+import com.microsoft.graph.core.IBaseClient;
+import com.microsoft.graph.http.CoreHttpProvider;
+import com.microsoft.graph.http.HttpMethod;
+import com.microsoft.graph.http.IHttpRequest;
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.DefaultSerializer;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import okhttp3.Call;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+public class BatchRequestContentTest {
+
+    String testurl = "http://graph.microsoft.com/me";
+
+    @Test
+    public void testBatchRequestContentCreation() throws MalformedURLException {
+        BatchRequestContent requestContent = new BatchRequestContent();
+        for (int i = 0; i < 5; i++) {
+            IHttpRequest requestStep = mock(IHttpRequest.class);
+            when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+            requestContent.addBatchRequestStep(requestStep);
+        }
+        assertTrue(requestContent.requests != null);
+    }
+
+    @Test
+    public void testGetBatchRequestContent() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        String stepId = requestContent.addBatchRequestStep(requestStep);
+        String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
+        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"get\",\"id\":\""+stepId+"\"}]}";
+        assertEquals(expectedContent, content);
+    }
+
+    @Test
+    public void testGetBatchRequestContentWithHeader() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        when(requestStep.getHeaders()).thenReturn(Arrays.asList(new HeaderOption("testkey", "testvalue")));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        String stepId = requestContent.addBatchRequestStep(requestStep);
+        String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
+        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"get\",\"id\":\""+stepId+"\",\"headers\":{\"testkey\":\"testvalue\"}}]}";
+        assertEquals(expectedContent, content);
+    }
+
+    @Test
+    public void testRemoveBatchRequesStepWithId() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        String stepId = requestContent.addBatchRequestStep(requestStep);
+        requestContent.removeBatchRequestStepWithId(stepId);
+        String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
+        String expectedContent = "{\"requests\":[]}";
+        assertEquals(expectedContent, content);
+    }
+
+    @Test
+    public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        BatchRequestContent requestContent = new BatchRequestContent();
+        String stepId = requestContent.addBatchRequestStep(requestStep);
+
+        IHttpRequest requestStep1 = mock(IHttpRequest.class);
+        when(requestStep1.getRequestUrl()).thenReturn(new URL(testurl));
+
+        String step1Id = requestContent.addBatchRequestStep(requestStep1, HttpMethod.GET, null, new HashSet<String>(Arrays.asList(stepId)));
+
+        requestContent.removeBatchRequestStepWithId(stepId);
+        String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
+        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"get\",\"id\":\""+step1Id+"\"}]}";
+        assertEquals(expectedContent, content);
+    }
+
+    @Test
+    public void defensiveProgrammingTests() {
+        assertThrows(NullPointerException.class, () -> {
+            new BatchRequestContent().addBatchRequestStep(null);
+        }, "should throw argument exception");
+        assertThrows(NullPointerException.class, () -> {
+            new BatchRequestContent().addBatchRequestStep(mock(IHttpRequest.class), null);
+        }, "null http method throws");
+
+        assertThrows(NullPointerException.class, () -> {
+            new BatchRequestContent().getStepById(null);
+        }, "get step by id with null id throws");
+
+        assertThrows(NullPointerException.class, () -> {
+            new BatchRequestContent() {{ requests = new ArrayList<>(); }}.removeBatchRequestStepWithId((String)null);
+        }, "remove step by id with null id throws");
+
+        assertThrows(IllegalArgumentException.class, () -> {
+            new BatchRequestContent().addBatchRequestStep(mock(IHttpRequest.class), HttpMethod.GET, null, new HashSet<String>(Arrays.asList("1")));
+        }, "dependency on inexisting step throws");
+    }
+
+    @Test
+    public void executeBatchTest() throws Throwable {
+        final BatchRequestContent content = new BatchRequestContent();
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        final String stepId = content.addBatchRequestStep(requestStep);
+
+        final OkHttpClient mHttpClient = mock(OkHttpClient.class);
+        final Call mCall = mock(Call.class);
+        when(mHttpClient.newCall(any(Request.class))).thenReturn(mCall);
+
+        final CoreHttpProvider mHttpProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)), mock(ILogger.class), mHttpClient);
+        final IBaseClient mClient = BaseClient.builder()
+                                            .authenticationProvider(mock(IAuthenticationProvider.class))
+                                            .httpProvider(mHttpProvider)
+                                            .buildClient();
+        final Response mResponse = new Response
+                                            .Builder()
+                                            .request(new Request
+                                                        .Builder()
+                                                        .url("https://graph.microsoft.com/v1.0/$batch")
+                                                        .build())
+                                            .code(200)
+                                            .protocol(Protocol.HTTP_1_1)
+                                            .message("OK")
+                                            .addHeader("Content-type", "application/json")
+                                            .body(ResponseBody.create("{\"responses\": [{\"id\": \""+stepId+"\",\"status\": 200,\"body\": null}]}",
+                                                    MediaType.parse("application/json")))
+                                            .build();
+        when(mCall.execute()).thenReturn(mResponse);
+        final BatchResponseContent batchResponse = mClient.batch().buildRequest().post(content);
+        assertNotNull(mClient.batch().buildRequest().postAsync(content));
+        final BatchResponseStep<?> response = batchResponse.getResponseById(stepId);
+        assertNotNull(response);
+    }
+    @Test
+    public void usesHttpMethodFromRequestIfAlreadySet() throws MalformedURLException
+    {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        when(requestStep.getHttpMethod()).thenReturn(HttpMethod.DELETE);
+        final BatchRequestContent batchRequest = new BatchRequestContent();
+        final String stepId = batchRequest.addBatchRequestStep(requestStep);
+        assertEquals(HttpMethod.DELETE, batchRequest.getStepById(stepId).method);
+    }
+    @Test
+    public void doesntThrowWhenTryingToRemoveRequestFromNull()
+    {
+        final BatchRequestContent batchRequest = new BatchRequestContent();
+        batchRequest.removeBatchRequestStepWithId("id");
+    }
+    @Test
+    public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException
+    {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        final BatchRequestContent batchRequest = new BatchRequestContent();
+        final String stepId = batchRequest.addBatchRequestStep(requestStep);
+        final String stepId2 = batchRequest.addBatchRequestStep(requestStep);
+        final String stepId3 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.GET, null, new HashSet<String>(Arrays.asList(stepId, stepId2)));
+
+        batchRequest.removeBatchRequestStepWithId(stepId);
+
+        assertNotNull(batchRequest.getStepById(stepId3).dependsOn);
+    }
+}
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
similarity index 66%
rename from src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
rename to src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
index eda781691..a7534d77a 100644
--- a/src/test/java/com/microsoft/graph/content/MSBatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
@@ -2,11 +2,18 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
 
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 
+import com.microsoft.graph.logger.ILogger;
+import com.microsoft.graph.serializer.DefaultSerializer;
+
 import org.junit.jupiter.api.Test;
 
 import okhttp3.MediaType;
@@ -16,105 +23,74 @@
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
-public class MSBatchResponseContentTest {
-
-    @Test
-    public void testNullMSBatchResponseContent() {
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchResponseContent((Response)null);
-        }, "should throw argument exception");
-    }
-
+public class BatchResponseContentTest {
     @Test
-    public void testValidMSBatchResponseContent() {
+    public void testValidBatchResponseContent() {
         String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-        Response responsedata = TestResponse(responsebody, requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-        assertTrue(batchresponse.getResponses() != null);
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
+        assertTrue(batchresponse.responses != null);
     }
 
     @Test
-    public void testInvalidMSBatchResponseContentWithEmptyResponse() {
+    public void testInvalidBatchResponseContentWithEmptyResponse() {
         String responsebody = "{\"responses\": [] }";
-        String requestbody = "{\"requests\":[]}";
-        Response responsedata = TestResponse(responsebody, requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
         assertTrue(batchresponse.getResponseById("1") == null);
     }
 
     @Test
-    public void testInvalidMSBatchResponseContentWithNullResponseString() {
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchResponseContent(null);
-        }, "should throw argument exception");
-    }
-
-    @Test
-    public void testInvalidMSBatchResponseContentWithMalformedResponse() {
+    public void testInvalidBatchResponseContentWithMalformedResponse() {
         String invalidResponsebody = "{responses: [] }";
-        String requestbody = "{requests:[]}";
-        Response invalidResponsedata = TestResponse(invalidResponsebody, requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(invalidResponsedata);
-        assertTrue(batchresponse.getResponses().keySet().isEmpty());
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(invalidResponsebody, BatchResponseContent.class);
+        assertTrue(batchresponse.responses.isEmpty());
     }
 
     @Test
-    public void testGetMSBatchResponseContentByID() throws IOException {
+    public void testGetBatchResponseContentByID() throws IOException {
         String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-        Response responsedata = TestResponse(responsebody,requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-        Response response = batchresponse.getResponseById("1");
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
+        BatchResponseStep<?> response = batchresponse.getResponseById("1");
         assertTrue(response != null);
     }
 
     @Test
-    public void testGetMSBatchResponseContentIteratorOverResponse() throws IOException {
+    public void testGetBatchResponseContentIteratorOverResponse() throws IOException {
         String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-        Response responsedata = TestResponse(responsebody,requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-        Iterator<Map.Entry<String, Response>> it = batchresponse.getResponsesIterator();
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
+        Iterator<BatchResponseStep<?>> it = batchresponse.responses.iterator();
         while(it.hasNext()) {
-            Map.Entry<String, Response> entry = it.next();
-            assertTrue(entry.getKey()!=null && entry.getValue()!=null);
+            BatchResponseStep<?> entry = it.next();
+            assertTrue(entry.id != null && entry.body !=null);
         }
     }
 
     @Test
-    public void testGetMSBatchResponseContentMapResponse() throws IOException {
+    public void testGetBatchResponseContentMapResponse() throws IOException {
         String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-        Response responsedata = TestResponse(responsebody,requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-        for(Map.Entry<String, Response> entry: batchresponse.getResponses().entrySet()) {
-            assertTrue(entry.getKey() != null && entry.getValue() != null);
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
+        for(BatchResponseStep<?> entry: batchresponse.responses) {
+            assertTrue(entry.id != null && entry.body != null);
         }
     }
 
     @Test
-    public void testGetMSBatchResponseContentUpdate() throws IOException {
+    public void testGetBatchResponseContentSize() throws IOException {
         String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-        String requestbody = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"1\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"2\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"3\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-        Response responsedata = TestResponse(responsebody,requestbody);
-        MSBatchResponseContent batchresponse = new MSBatchResponseContent(responsedata);
-        assertTrue(batchresponse.getResponses().size() == 3);
-        String responsebody2 = "{\"responses\": [{\"id\": \"4\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"5\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"6\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
-        String requestbody2 = "{\"requests\":[{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"4\",\"url\":\"me\"},{\"method\":\"GET\",\"dependsOn\":[],\"id\":\"5\",\"url\":\"me\\/drive\"},{\"headers\":{\"content-type\":\"application\\/json\"},\"method\":\"POST\",\"dependsOn\":[],\"id\":\"6\",\"body\":{\"displayName\":\"My Notebook -1263732088\"},\"url\":\"me\\/onenote\\/notebooks\"}]}";
-        Response responsedata2 = TestResponse(responsebody2,requestbody2);
-        batchresponse.update(responsedata2);
-        assertTrue(batchresponse.getResponses().size() == 6);
+        BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
+        assertTrue(batchresponse.responses.size() == 3);
     }
-
-    private Response TestResponse(String responsebody, String requestbody) {
-        Response.Builder builder = new Response.Builder();
-        builder.body(ResponseBody.create(MediaType.parse("application/json"), responsebody));
-        Request request = new Request.Builder().url("https://graph.microsoft.com/").method("POST", RequestBody.create(MediaType.parse("application/json"), requestbody)).build();
-        builder.request(request);
-        builder.protocol(Protocol.HTTP_1_0);
-        builder.code(200);
-        builder.message("test message");
-        return builder.build();
+    @Test
+    public void responseParsing() {
+        final BatchResponseContent batchResponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject("{\"responses\": [{\"id\": \"1\",\"status\": 200,\"body\": null}]}", BatchResponseContent.class);
+        assertEquals(1, batchResponse.responses.size());
+        final BatchResponseStep<?> response = batchResponse.getResponseById("1");
+        assertNotNull(response);
+        assertNull(batchResponse.getResponseById("2"));
+    }
+    @Test
+    public void getResponseWithIdReturnsNullOnEmptyResponses()
+    {
+        final BatchResponseContent batchResponse = new BatchResponseContent();
+        assertNull(batchResponse.getResponseById("id"));
     }
 }
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
deleted file mode 100644
index ab1fff017..000000000
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestContentTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.microsoft.graph.content;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.HashSet;
-import java.util.concurrent.ThreadLocalRandom;
-
-import com.google.gson.JsonParser;
-import com.microsoft.graph.authentication.IAuthenticationProvider;
-import com.microsoft.graph.core.BaseClient;
-import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.CoreHttpProvider;
-import com.microsoft.graph.logger.ILogger;
-import com.microsoft.graph.serializer.DefaultSerializer;
-
-import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import okhttp3.Call;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
-public class MSBatchRequestContentTest {
-
-    String testurl = "http://graph.microsoft.com/me";
-
-    @Test
-    public void testMSBatchRequestContentCreation() {
-        MSBatchRequestContent requestContent = new MSBatchRequestContent();
-        for (int i = 0; i < 5; i++) {
-            Request request = new Request.Builder().url(testurl).build();
-            MSBatchRequestStep requestStep = new MSBatchRequestStep("" + i, request);
-            requestContent.addBatchRequestStep(requestStep);
-        }
-        assertTrue(requestContent.getBatchRequestContent() != null);
-    }
-
-    @Test
-    public void testGetBatchRequestContent() {
-        Request request = new Request.Builder().url(testurl).build();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
-        MSBatchRequestContent requestContent = new MSBatchRequestContent();
-        requestContent.addBatchRequestStep(requestStep);
-        String content = requestContent.getBatchRequestContent();
-        String expectedContent = "{\"requests\":[{\"id\":\"1\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"dependsOn\":[]}]}";
-        assertTrue(content.compareTo(expectedContent) == 0);
-    }
-
-    @Test
-    public void testGetBatchRequestContentWithHeader() {
-        Request request = new Request.Builder().url(testurl).header("testkey", "testvalue").build();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
-        MSBatchRequestContent requestContent = new MSBatchRequestContent();
-        requestContent.addBatchRequestStep(requestStep);
-        String content = requestContent.getBatchRequestContent();
-        System.out.println(content);
-        String expectedContent = "{\"requests\":[{\"id\":\"1\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"headers\":{\"testkey\":\"testvalue\"},\"dependsOn\":[]}]}";
-        assertTrue(content.compareTo(expectedContent) == 0);
-    }
-
-    @Test
-    public void testRemoveBatchRequesStepWithId() {
-        Request request = new Request.Builder().url(testurl).build();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
-        MSBatchRequestContent requestContent = new MSBatchRequestContent();
-        requestContent.addBatchRequestStep(requestStep);
-        requestContent.removeBatchRequestStepWithId("1");
-        String content = requestContent.getBatchRequestContent();
-        String expectedContent = "{\"requests\":[]}";
-        assertTrue(content.compareTo(expectedContent) == 0);
-    }
-
-    @Test
-    public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() {
-        Request request = new Request.Builder().url(testurl).build();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
-
-        Request request1 = new Request.Builder().url(testurl).build();
-        MSBatchRequestStep requestStep1 = new MSBatchRequestStep("2", request1, "1");
-
-        MSBatchRequestContent requestContent = new MSBatchRequestContent();
-        requestContent.addBatchRequestStep(requestStep);
-        requestContent.addBatchRequestStep(requestStep1);
-
-        requestContent.removeBatchRequestStepWithId("1");
-        String content = requestContent.getBatchRequestContent();
-        String expectedContent = "{\"requests\":[{\"id\":\"2\",\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"dependsOn\":[]}]}";
-        assertTrue(content.compareTo(expectedContent) == 0);
-    }
-
-    @Test
-    public void defensiveProgrammingTests() {
-        final MSBatchRequestStep mockStep = mock(MSBatchRequestStep.class);
-        final HashSet<String> reservedIds = new HashSet<>();
-        when(mockStep.getRequestId()).thenAnswer(new Answer<String>() {
-            @Override
-            public String answer(InvocationOnMock invocation) throws Throwable {
-                return getNewId(reservedIds);
-            }
-        });
-
-        assertThrows(IllegalArgumentException.class, () -> {
-            new MSBatchRequestContent(mock(ILogger.class), null, null, null, null, null, null, null, null, null, null, null, null, null,
-                    null, null, null, null, null, null, null, null, null);
-        }, "the number of steps cannot exceed 20");
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchRequestContent((ILogger) null, (MSBatchRequestStep)null);
-        }, "the logger cannot be null");
-
-        new MSBatchRequestContent(mockStep, null); // addind a null step doesn't throw
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchRequestContent().addBatchRequestStep(null);
-        }, "should throw argument exception");
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchRequestContent().addBatchRequestStep((Request) null);
-        }, "should throw argument exception");
-
-        assertThrows(IllegalArgumentException.class, () -> {
-            final MSBatchRequestContent batchContent = new MSBatchRequestContent();
-            for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
-                assertNotNull(batchContent.addBatchRequestStep(mock(Request.class)));
-            }
-            batchContent.addBatchRequestStep(mock(Request.class));
-        }, "the number of steps cannot exceed 20");
-        {
-            final MSBatchRequestContent batchContent = new MSBatchRequestContent();
-            reservedIds.clear();
-            for (int i = 0; i < MSBatchRequestContent.MAX_NUMBER_OF_REQUESTS; i++) {
-                assertTrue(batchContent.addBatchRequestStep(mockStep), "item number " + i + " should be added successfully");
-            }
-            assertFalse(batchContent.addBatchRequestStep(mockStep));
-        }
-    }
-
-    private String getNewId(final HashSet<String> reserved) {
-        String requestId;
-        do {
-            requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
-        } while (reserved.contains(requestId));
-        reserved.add(requestId);
-        return requestId;
-    }
-
-    @Test
-    @SuppressWarnings("unchecked")
-    public void executeBatchTest() throws Throwable {
-        final MSBatchRequestStep step = new MSBatchRequestStep("1", new Request
-                                                                    .Builder()
-                                                                    .url(testurl)
-                                                                    .method("GET", null)
-                                                                    .build());
-        final MSBatchRequestContent content = new MSBatchRequestContent(step);
-        final OkHttpClient mHttpClient = mock(OkHttpClient.class);
-        final Call mCall = mock(Call.class);
-        when(mHttpClient.newCall(any(Request.class))).thenReturn(mCall);
-
-        final CoreHttpProvider mHttpProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)), mock(ILogger.class), mHttpClient);
-        final IBaseClient mClient = BaseClient.builder()
-                                            .authenticationProvider(mock(IAuthenticationProvider.class))
-                                            .httpProvider(mHttpProvider)
-                                            .buildClient();
-        final Response mResponse = new Response
-                                            .Builder()
-                                            .request(new Request
-                                                        .Builder()
-                                                        .url("https://graph.microsoft.com/v1.0/$batch")
-                                                        .build())
-                                            .code(200)
-                                            .protocol(Protocol.HTTP_1_1)
-                                            .message("OK")
-                                            .addHeader("Content-type", "application/json")
-                                            .body(ResponseBody.create("{\"responses\": [{\"id\": \"1\",\"status\": 200,\"body\": null}]}",
-                                                    MediaType.parse("application/json")))
-                                            .build();
-        when(mCall.execute()).thenReturn(mResponse);
-        final MSBatchResponseContent batchResponse = content.execute(mClient);
-        final Response response = batchResponse.getResponseById("1");
-        assertNotNull(response);
-    }
-    @Test
-    public void responseParsing() {
-        final MSBatchResponseContent batchResponse = new MSBatchResponseContent(mock(ILogger.class), "https://graph.microsoft.com/v1.0",
-                                                        JsonParser.parseString("{\"requests\":[{\"id\":\"1\",\"method\":\"GET\",\"url\":\"/me\"}]}")
-                                                                    .getAsJsonObject(),
-                                                        JsonParser.parseString("{\"responses\": [{\"id\": \"1\",\"status\": 200,\"body\": null}]}")
-                                                                    .getAsJsonObject());
-        final Response response = batchResponse.getResponseById("1");
-        assertNotNull(response);
-    }
-}
diff --git a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java b/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
deleted file mode 100644
index 1e6d7bbf0..000000000
--- a/src/test/java/com/microsoft/graph/content/MSBatchRequestStepTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.microsoft.graph.content;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.mock;
-
-import org.junit.jupiter.api.Test;
-
-import okhttp3.Request;
-
-public class MSBatchRequestStepTest {
-
-    @Test
-    public void testMSBatchRequestStepCreation() {
-        Request request = new Request.Builder().url("http://graph.microsoft.com").build();
-        MSBatchRequestStep requestStep = new MSBatchRequestStep("1", request);
-        assertTrue(requestStep != null, "Test BatchRequestStep creation");
-        assertTrue(requestStep.getRequestId().compareTo("1") == 0, "Test Request id");
-        assertTrue(requestStep.getRequest() == request, "Test Request object");
-        assertTrue(requestStep.getDependsOnIds() != null, "Test Array of depends on Ids");
-    }
-
-    @Test
-    public void defensiveProgrammingTests() {
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchRequestStep(null, null);
-        }, "should throw argument exception");
-        assertThrows(NullPointerException.class, () -> {
-            new MSBatchRequestStep("id", null);
-        }, "should throw argument exception");
-        assertThrows(IllegalArgumentException.class, () -> {
-            new MSBatchRequestStep("", null);
-        }, "should throw argument exception");
-        new MSBatchRequestStep("id", mock(Request.class));
-    }
-
-}

From 75bc313b274357cbce501ff06db4e9668d6c2b39 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 12:16:55 -0500
Subject: [PATCH 161/213] - adds missing javadoc comments for new batch
 infrastructure

---
 .../graph/content/BatchRequestContent.java    | 40 +++++++++++++++++++
 .../graph/content/BatchRequestStep.java       |  2 +
 .../graph/content/BatchResponseContent.java   |  8 ++++
 3 files changed, 50 insertions(+)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
index 5a2cb5612..797647453 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
@@ -40,24 +40,54 @@
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.options.HeaderOption;
 
+/** Respresents the content of a JSON batch request */
 public class BatchRequestContent {
+    /** Steps part of the batch request */
     @Expose
     @SerializedName("requests")
     public List<BatchRequestStep<?>> requests;
 
+    /**
+     * Adds a request as a step to the current batch. Defaults to GET if the HTTP method is not set in the request.
+     * @param request the request to add as a step
+     * @return the id of the step that was just added to the batch
+     */
     @Nonnull
     public String addBatchRequestStep(@Nonnull final IHttpRequest request) {
         Objects.requireNonNull(request, "request parameter cannot be null");
         return addBatchRequestStep(request, request.getHttpMethod() == null ? HttpMethod.GET : request.getHttpMethod());
     }
+    /**
+     * Adds a request as a step to the current batch
+     * @param request the request to add as a step
+     * @param httpMethod the HttpMethod to execute the request with
+     * @return the id of the step that was just added to the batch
+     */
     @Nonnull
     public String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod) {
         return addBatchRequestStep(request, httpMethod, null);
     }
+    /**
+     * Adds a request as a step to the current batch
+     * @param request the request to add as a step
+     * @param httpMethod the HttpMethod to execute the request with
+     * @param <T> the type of the request body
+     * @param serializableBody the body of the request to be serialized
+     * @return the id of the step that was just added to the batch
+     */
     @Nonnull
     public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody) {
         return addBatchRequestStep(request, httpMethod, serializableBody, null);
     }
+    /**
+     * Adds a request as a step to the current batch
+     * @param request the request to add as a step
+     * @param httpMethod the HttpMethod to execute the request with
+     * @param <T> the type of the request body
+     * @param serializableBody the body of the request to be serialized
+     * @param dependsOnRequestsIds the ids of steps this request depends on
+     * @return the id of the step that was just added to the batch
+     */
     public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final HashSet<String> dependsOnRequestsIds) {
         Objects.requireNonNull(request, "request parameter cannot be null");
         Objects.requireNonNull(httpMethod, "httpMethod parameter cannot be null");
@@ -87,6 +117,10 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
         requests.add(step);
         return step.id;
     }
+    /**
+     * Removes requests from the requests to be executed by the batch. Also removes any dependency references that might exist.
+     * @param stepIds ids of steps to be removed.
+     */
     public void removeBatchRequestStepWithId(@Nonnull final String ...stepIds) {
         if(requests == null) return;
 
@@ -102,6 +136,12 @@ public void removeBatchRequestStepWithId(@Nonnull final String ...stepIds) {
             }
         }
     }
+    /**
+     * Gets a step by its step id
+     * @param <T> the type of the request body
+     * @param stepId the request step id returned from the add method
+     * @return the request corresponding to the provided id or null
+     */
     @Nullable
     @SuppressWarnings("unchecked")
     public <T> BatchRequestStep<T> getStepById(@Nonnull final String stepId) {
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
index 22b2521ec..f6f8a5191 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
@@ -37,9 +37,11 @@ public class BatchRequestStep<T> extends BatchStep<T> {
     @Expose
     @SerializedName("url")
     public String url;
+    /** The HTTP method to use to execute the request */
     @Expose
     @SerializedName("method")
     public HttpMethod method;
+    /** The IDs of the steps this step depends on before being executed */
     @Expose
     @SerializedName("dependsOn")
     public HashSet<String> dependsOn;
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
index 85e2660e9..389e349eb 100644
--- a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
@@ -31,11 +31,19 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
+/** Respresents the result of a JSON batch request */
 public class BatchResponseContent {
+    /** Responses to the steps from the request */
     @Expose
     @SerializedName("responses")
     public List<BatchResponseStep<?>> responses;
 
+    /**
+     * Gets a response to a request in the batch by its id
+     * @param <T> Type of the response body
+     * @param stepId Id of the request step in the batch request
+     * @return The step response corresponding to the ID or null
+     */
     @Nullable
     @SuppressWarnings("unchecked")
     public <T> BatchResponseStep<T> getResponseById(@Nonnull final String stepId) {

From 91b38908bc707fe9f2a67a10622099ab2beebf35 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 12:50:43 -0500
Subject: [PATCH 162/213] - fixes access modifiers for batch request methods

---
 src/main/java/com/microsoft/graph/content/BatchRequest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequest.java b/src/main/java/com/microsoft/graph/content/BatchRequest.java
index d8fbfb851..73030036c 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequest.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequest.java
@@ -55,7 +55,7 @@ public BatchRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable
-    protected BatchResponseContent post(@Nonnull final BatchRequestContent content) throws ClientException {
+    public BatchResponseContent post(@Nonnull final BatchRequestContent content) throws ClientException {
         this.setHttpMethod(HttpMethod.POST);
         return this.getClient().getHttpProvider().send(this, BatchResponseContent.class, content);
     }
@@ -67,7 +67,7 @@ protected BatchResponseContent post(@Nonnull final BatchRequestContent content)
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable
-    protected java.util.concurrent.CompletableFuture<BatchResponseContent> postAsync(@Nonnull final BatchRequestContent content) throws ClientException {
+    public java.util.concurrent.CompletableFuture<BatchResponseContent> postAsync(@Nonnull final BatchRequestContent content) throws ClientException {
         this.setHttpMethod(HttpMethod.POST);
         return this.getClient().getHttpProvider().sendAsync(this, BatchResponseContent.class, content);
     }

From d025c850f3ced520001a3826da87cfb6b1e6caa9 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 12:51:33 -0500
Subject: [PATCH 163/213] - adds support for var ags dependon ids in batches

---
 .../com/microsoft/graph/content/BatchRequestContent.java   | 7 ++++---
 .../microsoft/graph/content/BatchRequestContentTest.java   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
index 797647453..da05bf0de 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
@@ -23,6 +23,7 @@
 package com.microsoft.graph.content;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -77,7 +78,7 @@ public String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull
      */
     @Nonnull
     public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody) {
-        return addBatchRequestStep(request, httpMethod, serializableBody, null);
+        return addBatchRequestStep(request, httpMethod, serializableBody, (String[])null);
     }
     /**
      * Adds a request as a step to the current batch
@@ -88,7 +89,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
      * @param dependsOnRequestsIds the ids of steps this request depends on
      * @return the id of the step that was just added to the batch
      */
-    public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final HashSet<String> dependsOnRequestsIds) {
+    public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final String ...dependsOnRequestsIds) {
         Objects.requireNonNull(request, "request parameter cannot be null");
         Objects.requireNonNull(httpMethod, "httpMethod parameter cannot be null");
         if(dependsOnRequestsIds != null)
@@ -105,7 +106,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
             url = protocolAndHostReplacementMatcher.replaceAll("");
             body = serializableBody;
             method = httpMethod;
-            dependsOn = dependsOnRequestsIds;
+            dependsOn = dependsOnRequestsIds != null && dependsOnRequestsIds.length > 0 ? new HashSet<String>(Arrays.asList(dependsOnRequestsIds)) : null;
             id = getNextRequestId();
         }};
 
diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
index 54238abe7..28e65fe45 100644
--- a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
@@ -100,7 +100,7 @@ public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() throws M
         IHttpRequest requestStep1 = mock(IHttpRequest.class);
         when(requestStep1.getRequestUrl()).thenReturn(new URL(testurl));
 
-        String step1Id = requestContent.addBatchRequestStep(requestStep1, HttpMethod.GET, null, new HashSet<String>(Arrays.asList(stepId)));
+        String step1Id = requestContent.addBatchRequestStep(requestStep1, HttpMethod.GET, null, stepId);
 
         requestContent.removeBatchRequestStepWithId(stepId);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
@@ -126,7 +126,7 @@ public void defensiveProgrammingTests() {
         }, "remove step by id with null id throws");
 
         assertThrows(IllegalArgumentException.class, () -> {
-            new BatchRequestContent().addBatchRequestStep(mock(IHttpRequest.class), HttpMethod.GET, null, new HashSet<String>(Arrays.asList("1")));
+            new BatchRequestContent().addBatchRequestStep(mock(IHttpRequest.class), HttpMethod.GET, null, "1");
         }, "dependency on inexisting step throws");
     }
 
@@ -189,7 +189,7 @@ public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException
         final BatchRequestContent batchRequest = new BatchRequestContent();
         final String stepId = batchRequest.addBatchRequestStep(requestStep);
         final String stepId2 = batchRequest.addBatchRequestStep(requestStep);
-        final String stepId3 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.GET, null, new HashSet<String>(Arrays.asList(stepId, stepId2)));
+        final String stepId3 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.GET, null, stepId, stepId2);
 
         batchRequest.removeBatchRequestStepWithId(stepId);
 

From b6b5f8ab9bd39fba084e17aaf8c65bde29c5edb8 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 14:18:19 -0500
Subject: [PATCH 164/213] - fixes a bug where the batch requests would be
 missing the content type - fixes a bug where the batch request method would
 not be cased properly

---
 .../graph/content/BatchRequestContent.java    | 12 ++-
 .../graph/content/BatchRequestStep.java       |  3 +-
 .../content/BatchRequestContentTest.java      | 88 +++++++++++++------
 3 files changed, 70 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
index da05bf0de..1d8251f4c 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
@@ -40,6 +40,7 @@
 import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.IJsonBackedObject;
 
 /** Respresents the content of a JSON batch request */
 public class BatchRequestContent {
@@ -105,7 +106,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
         final BatchRequestStep<T> step = new BatchRequestStep<T>() {{
             url = protocolAndHostReplacementMatcher.replaceAll("");
             body = serializableBody;
-            method = httpMethod;
+            method = httpMethod.toString().toUpperCase();
             dependsOn = dependsOnRequestsIds != null && dependsOnRequestsIds.length > 0 ? new HashSet<String>(Arrays.asList(dependsOnRequestsIds)) : null;
             id = getNextRequestId();
         }};
@@ -113,11 +114,18 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
         if(!request.getHeaders().isEmpty()) {
             step.headers = new HashMap<>();
             for(final HeaderOption headerOption : request.getHeaders())
-                step.headers.putIfAbsent(headerOption.getName(), headerOption.getValue().toString());
+                step.headers.putIfAbsent(headerOption.getName().toLowerCase(), headerOption.getValue().toString());
+        }
+        if(step.body != null && step.body instanceof IJsonBackedObject &&
+            (step.headers == null || !step.headers.containsKey(contentTypeHeaderKey))) {
+            if(step.headers == null)
+                step.headers = new HashMap<>();
+            step.headers.putIfAbsent(contentTypeHeaderKey, "application/json");
         }
         requests.add(step);
         return step.id;
     }
+    private static final String contentTypeHeaderKey = "content-type";
     /**
      * Removes requests from the requests to be executed by the batch. Also removes any dependency references that might exist.
      * @param stepIds ids of steps to be removed.
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
index f6f8a5191..022a63a2c 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
@@ -28,7 +28,6 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
-import com.microsoft.graph.http.HttpMethod;
 
 /** the http request for the batch step */
 public class BatchRequestStep<T> extends BatchStep<T> {
@@ -40,7 +39,7 @@ public class BatchRequestStep<T> extends BatchStep<T> {
     /** The HTTP method to use to execute the request */
     @Expose
     @SerializedName("method")
-    public HttpMethod method;
+    public String method;
     /** The IDs of the steps this step depends on before being executed */
     @Expose
     @SerializedName("dependsOn")
diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
index 28e65fe45..ccd7ea895 100644
--- a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
@@ -17,6 +17,7 @@
 import java.util.HashSet;
 import java.util.concurrent.ThreadLocalRandom;
 
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.core.BaseClient;
@@ -26,7 +27,10 @@
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.serializer.AdditionalDataManager;
 import com.microsoft.graph.serializer.DefaultSerializer;
+import com.microsoft.graph.serializer.IJsonBackedObject;
+import com.microsoft.graph.serializer.ISerializer;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.invocation.InvocationOnMock;
@@ -62,7 +66,8 @@ public void testGetBatchRequestContent() throws MalformedURLException {
         BatchRequestContent requestContent = new BatchRequestContent();
         String stepId = requestContent.addBatchRequestStep(requestStep);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
-        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"get\",\"id\":\""+stepId+"\"}]}";
+        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"id\":\""
+                + stepId + "\"}]}";
         assertEquals(expectedContent, content);
     }
 
@@ -74,7 +79,8 @@ public void testGetBatchRequestContentWithHeader() throws MalformedURLException
         BatchRequestContent requestContent = new BatchRequestContent();
         String stepId = requestContent.addBatchRequestStep(requestStep);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
-        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"get\",\"id\":\""+stepId+"\",\"headers\":{\"testkey\":\"testvalue\"}}]}";
+        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"id\":\""
+                + stepId + "\",\"headers\":{\"testkey\":\"testvalue\"}}]}";
         assertEquals(expectedContent, content);
     }
 
@@ -104,7 +110,8 @@ public void testRemoveBatchRequesStepWithIdByAddingMultipleBatchSteps() throws M
 
         requestContent.removeBatchRequestStepWithId(stepId);
         String content = new DefaultSerializer(mock(ILogger.class)).serializeObject(requestContent);
-        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"get\",\"id\":\""+step1Id+"\"}]}";
+        String expectedContent = "{\"requests\":[{\"url\":\"http://graph.microsoft.com/me\",\"method\":\"GET\",\"id\":\""
+                + step1Id + "\"}]}";
         assertEquals(expectedContent, content);
     }
 
@@ -122,7 +129,11 @@ public void defensiveProgrammingTests() {
         }, "get step by id with null id throws");
 
         assertThrows(NullPointerException.class, () -> {
-            new BatchRequestContent() {{ requests = new ArrayList<>(); }}.removeBatchRequestStepWithId((String)null);
+            new BatchRequestContent() {
+                {
+                    requests = new ArrayList<>();
+                }
+            }.removeBatchRequestStepWithId((String) null);
         }, "remove step by id with null id throws");
 
         assertThrows(IllegalArgumentException.class, () -> {
@@ -141,49 +152,42 @@ public void executeBatchTest() throws Throwable {
         final Call mCall = mock(Call.class);
         when(mHttpClient.newCall(any(Request.class))).thenReturn(mCall);
 
-        final CoreHttpProvider mHttpProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)), mock(ILogger.class), mHttpClient);
-        final IBaseClient mClient = BaseClient.builder()
-                                            .authenticationProvider(mock(IAuthenticationProvider.class))
-                                            .httpProvider(mHttpProvider)
-                                            .buildClient();
-        final Response mResponse = new Response
-                                            .Builder()
-                                            .request(new Request
-                                                        .Builder()
-                                                        .url("https://graph.microsoft.com/v1.0/$batch")
-                                                        .build())
-                                            .code(200)
-                                            .protocol(Protocol.HTTP_1_1)
-                                            .message("OK")
-                                            .addHeader("Content-type", "application/json")
-                                            .body(ResponseBody.create("{\"responses\": [{\"id\": \""+stepId+"\",\"status\": 200,\"body\": null}]}",
-                                                    MediaType.parse("application/json")))
-                                            .build();
+        final CoreHttpProvider mHttpProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)),
+                mock(ILogger.class), mHttpClient);
+        final IBaseClient mClient = BaseClient.builder().authenticationProvider(mock(IAuthenticationProvider.class))
+                .httpProvider(mHttpProvider).buildClient();
+        final Response mResponse = new Response.Builder()
+                .request(new Request.Builder().url("https://graph.microsoft.com/v1.0/$batch").build()).code(200)
+                .protocol(Protocol.HTTP_1_1).message("OK").addHeader("Content-type", "application/json")
+                .body(ResponseBody.create(
+                        "{\"responses\": [{\"id\": \"" + stepId + "\",\"status\": 200,\"body\": null}]}",
+                        MediaType.parse("application/json")))
+                .build();
         when(mCall.execute()).thenReturn(mResponse);
         final BatchResponseContent batchResponse = mClient.batch().buildRequest().post(content);
         assertNotNull(mClient.batch().buildRequest().postAsync(content));
         final BatchResponseStep<?> response = batchResponse.getResponseById(stepId);
         assertNotNull(response);
     }
+
     @Test
-    public void usesHttpMethodFromRequestIfAlreadySet() throws MalformedURLException
-    {
+    public void usesHttpMethodFromRequestIfAlreadySet() throws MalformedURLException {
         IHttpRequest requestStep = mock(IHttpRequest.class);
         when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
         when(requestStep.getHttpMethod()).thenReturn(HttpMethod.DELETE);
         final BatchRequestContent batchRequest = new BatchRequestContent();
         final String stepId = batchRequest.addBatchRequestStep(requestStep);
-        assertEquals(HttpMethod.DELETE, batchRequest.getStepById(stepId).method);
+        assertEquals("DELETE", batchRequest.getStepById(stepId).method);
     }
+
     @Test
-    public void doesntThrowWhenTryingToRemoveRequestFromNull()
-    {
+    public void doesntThrowWhenTryingToRemoveRequestFromNull() {
         final BatchRequestContent batchRequest = new BatchRequestContent();
         batchRequest.removeBatchRequestStepWithId("id");
     }
+
     @Test
-    public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException
-    {
+    public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException {
         IHttpRequest requestStep = mock(IHttpRequest.class);
         when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
         final BatchRequestContent batchRequest = new BatchRequestContent();
@@ -195,4 +199,30 @@ public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException
 
         assertNotNull(batchRequest.getStepById(stepId3).dependsOn);
     }
+
+    @Test
+    public void addsContentTypeForBodies() throws MalformedURLException {
+        IHttpRequest requestStep = mock(IHttpRequest.class);
+        when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
+        final BatchRequestContent batchRequest = new BatchRequestContent();
+        final IJsonBackedObject body = new IJsonBackedObject() {
+
+            @Override
+            public void setRawObject(ISerializer serializer, JsonObject json) {
+                // TODO Auto-generated method stub
+
+            }
+
+            @Override
+            public AdditionalDataManager additionalDataManager() {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+        };
+        final String stepId = batchRequest.addBatchRequestStep(requestStep, HttpMethod.POST, body);
+        final BatchRequestStep<?> step = batchRequest.getStepById(stepId);
+        assertNotNull(step.headers);
+        assertEquals("application/json", step.headers.get("content-type"));
+    }
 }

From 97e8397cb2c9ed72f4a5d8b164bdb7e8071b5aa2 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 14:45:58 -0500
Subject: [PATCH 165/213] - adds additinoal unit tests cases for body header in
 batches

---
 .../graph/content/BatchRequestContentTest.java  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
index ccd7ea895..4c970fa9f 100644
--- a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
@@ -224,5 +224,22 @@ public AdditionalDataManager additionalDataManager() {
         final BatchRequestStep<?> step = batchRequest.getStepById(stepId);
         assertNotNull(step.headers);
         assertEquals("application/json", step.headers.get("content-type"));
+
+        when(requestStep.getHeaders()).thenReturn(Arrays.asList(new HeaderOption("dummy", "dummy")));
+        final String stepId2 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.POST, body);
+        final BatchRequestStep<?> step2 = batchRequest.getStepById(stepId2);
+        assertNotNull(step2.headers);
+        assertEquals("application/json", step2.headers.get("content-type"));
+
+        final String stepId3 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.POST, Integer.valueOf(10));
+        final BatchRequestStep<?> step3 = batchRequest.getStepById(stepId3);
+        assertNotNull(step3.headers);
+        assertNull(step3.headers.get("content-type"));
+
+        when(requestStep.getHeaders()).thenReturn(Arrays.asList(new HeaderOption("Content-type", "application/octect-stream")));
+        final String stepId4 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.POST, Integer.valueOf(10));
+        final BatchRequestStep<?> step4 = batchRequest.getStepById(stepId4);
+        assertNotNull(step4.headers);
+        assertEquals("application/octect-stream", step4.headers.get("content-type"));
     }
 }

From 5a98e14668a58406d1a001af8c5cebbf22935093 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 16:40:46 -0500
Subject: [PATCH 166/213] - fixes a bug where batch response bodies would not
 be deserialized properly

---
 .../graph/content/BatchResponseContent.java   | 11 +++---
 .../graph/content/BatchResponseStep.java      | 32 ++++++++++++++++
 .../graph/http/GraphServiceException.java     | 38 +++++++++++++++----
 .../content/BatchResponseContentTest.java     | 23 ++++++++++-
 4 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
index 389e349eb..ab06e99ee 100644
--- a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
@@ -28,6 +28,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.google.gson.JsonElement;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
@@ -36,23 +37,21 @@ public class BatchResponseContent {
     /** Responses to the steps from the request */
     @Expose
     @SerializedName("responses")
-    public List<BatchResponseStep<?>> responses;
+    public List<BatchResponseStep<JsonElement>> responses;
 
     /**
      * Gets a response to a request in the batch by its id
-     * @param <T> Type of the response body
      * @param stepId Id of the request step in the batch request
      * @return The step response corresponding to the ID or null
      */
     @Nullable
-    @SuppressWarnings("unchecked")
-    public <T> BatchResponseStep<T> getResponseById(@Nonnull final String stepId) {
+    public BatchResponseStep<JsonElement> getResponseById(@Nonnull final String stepId) {
         Objects.requireNonNull(stepId, "parameter stepId cannot be null");
         if(responses == null) return null;
 
-        for(final BatchResponseStep<?> step : responses) {
+        for(final BatchResponseStep<JsonElement> step : responses) {
             if(stepId.equals(step.id))
-                return (BatchResponseStep<T>)step;
+                return step;
         }
         return null;
     }
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
index 60e513ead..a51da4ea6 100644
--- a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
@@ -21,8 +21,19 @@
 // ------------------------------------------------------------------------------
 package com.microsoft.graph.content;
 
+import java.util.ArrayList;
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.gson.JsonElement;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.microsoft.graph.http.GraphErrorResponse;
+import com.microsoft.graph.http.GraphFatalServiceException;
+import com.microsoft.graph.http.GraphServiceException;
+import com.microsoft.graph.serializer.ISerializer;
 
 /** Response for the batch step */
 public class BatchResponseStep<T> extends BatchStep<T> {
@@ -30,4 +41,25 @@ public class BatchResponseStep<T> extends BatchStep<T> {
     @Expose
     @SerializedName("status")
     public int status;
+
+    /**
+     * Returned the deserialized response body of the current step
+     * @param <T2> type of the response body
+     * @param serializer serializer to use for deserialization. graphClient.getSerializer()
+     * @param resultClass class of the resulting response body
+     * @return the deserialized response body
+     * @throws GraphServiceException when a bad request was sent
+     * @throws GraphFatalServiceException when the service did not complete the operation as expected because of an internal error
+     */
+    @Nullable
+    public <T2> T2 getDeserializedBody(@Nonnull final ISerializer serializer, @Nonnull final Class<T2> resultClass) throws GraphServiceException, GraphFatalServiceException {
+        Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
+        if(body == null || !(body instanceof JsonElement)) return null;
+
+        final GraphErrorResponse error = serializer.deserializeObject((JsonElement)body, GraphErrorResponse.class);
+        if(error == null || error.error == null) {
+            return serializer.deserializeObject((JsonElement)body, resultClass);
+        } else
+            throw GraphServiceException.createFromResponse("", "", new ArrayList<>(), "", headers, "", status, error, false);
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index 8e7ce29cd..12015737d 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.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
@@ -184,7 +184,7 @@ public String getResponseMessage() {
     public String getMessage() {
         return getMessage(verbose);
     }
-    
+
     /**
      * Gets the HTTP status code
      *
@@ -229,7 +229,7 @@ public String getMethod() {
     public String getUrl() {
         return url;
     }
-    
+
     /**
      * Gets the request headers
      * @return the request headers
@@ -369,8 +369,32 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
         }
 
         final int responseCode = response.code();
-        final List<String> responseHeaders = new LinkedList<>();
         final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
+        final String responseMessage = response.message();
+        GraphErrorResponse error = parseErrorResponse(serializer, response);
+
+        return createFromResponse(url, method, requestHeaders, requestBody, headers, responseMessage, responseCode, error, isVerbose);
+
+    }
+    /**
+     * Creates a Graph service exception.
+     * @param url url of the original request
+     * @param method http method of the original request
+     * @param requestHeaders headers of the original request
+     * @param requestBody body of the original request
+     * @param headers response headers
+     * @param responseMessage reponse status message
+     * @param responseCode response status code
+     * @param error graph error response object
+     * @param isVerbose whether to display a verbose message or not
+     * @return the Exception to be thrown
+     */
+    @Nonnull
+    public static GraphServiceException createFromResponse(@Nullable final String url, @Nullable final String method, @Nonnull final List<String> requestHeaders,
+        @Nullable final String requestBody,
+        @Nonnull final Map<String,String> headers, @Nonnull final String responseMessage, final int responseCode,
+        @Nonnull final GraphErrorResponse error, final boolean isVerbose) {
+        final List<String> responseHeaders = new LinkedList<>();
         for (final String key : headers.keySet()) {
             final String fieldPrefix;
             if (key == null) {
@@ -381,9 +405,7 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
             responseHeaders.add(fieldPrefix + headers.get(key));
         }
 
-        final String responseMessage = response.message();
 
-        GraphErrorResponse error = parseErrorResponse(serializer, response);
 
         if (responseCode >= INTERNAL_SERVER_ERROR) {
             return new GraphFatalServiceException(method,
diff --git a/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
index a7534d77a..842505db5 100644
--- a/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
@@ -11,8 +11,12 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.google.gson.JsonElement;
+import com.microsoft.graph.http.GraphErrorResponse;
+import com.microsoft.graph.http.GraphServiceException;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.serializer.DefaultSerializer;
+import com.microsoft.graph.serializer.ISerializer;
 
 import org.junit.jupiter.api.Test;
 
@@ -57,7 +61,7 @@ public void testGetBatchResponseContentByID() throws IOException {
     public void testGetBatchResponseContentIteratorOverResponse() throws IOException {
         String responsebody = "{\"responses\": [{\"id\": \"1\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users/$entity\",\"businessPhones\":[\"8006427676\"],\"displayName\":\"MOD Administrator\",\"givenName\":\"MOD\",\"jobTitle\":null,\"mail\":\"admin@M365x751487.OnMicrosoft.com\",\"mobilePhone\":\"425-882-1032\",\"officeLocation\":null,\"preferredLanguage\":\"en-US\",\"surname\":\"Administrator\",\"userPrincipalName\":\"admin@M365x751487.onmicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\"}},{\"id\": \"2\",\"status\":200,\"headers\" : {\"Cache-Control\":\"no-store, no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#drives/$entity\",\"createdDateTime\":\"2019-01-12T09:05:38Z\",\"description\":\"\",\"id\":\"b!nlu9o5I9g0y8gsHXfUM_bPTZ0oM_wVNArHM5R4-VkHLlnxx5SpqHRJledwfICP9f\",\"lastModifiedDateTime\":\"2019-03-06T06:59:04Z\",\"name\":\"OneDrive\",\"webUrl\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents\",\"driveType\":\"business\",\"createdBy\":{\"user\":{\"displayName\":\"System Account\"}},\"lastModifiedBy\":{\"user\":{\"displayName\":\"System Account\"}},\"owner\":{\"user\":{\"email\":\"admin@M365x751487.OnMicrosoft.com\",\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"quota\":{\"deleted\":0,\"remaining\":1099509670098,\"state\":\"normal\",\"total\":1099511627776,\"used\":30324}}},{\"id\": \"3\",\"status\":201,\"headers\" : {\"Location\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"Preference-Applied\":\"odata.include-annotations=*\",\"Cache-Control\":\"no-cache\",\"OData-Version\":\"4.0\",\"Content-Type\":\"application/json;odata.metadata=minimal;odata.streaming=true;IEEE754Compatible=false;charset=utf-8\"},\"body\":{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#users('6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c')/onenote/notebooks/$entity\",\"id\":\"1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"self\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0\",\"createdDateTime\":\"2019-03-06T08:08:09Z\",\"displayName\":\"My Notebook -442293399\",\"lastModifiedDateTime\":\"2019-03-06T08:08:09Z\",\"isDefault\":false,\"userRole\":\"Owner\",\"isShared\":false,\"sectionsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sections\",\"sectionGroupsUrl\":\"https://graph.microsoft.com/v1.0/users/6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c/onenote/notebooks/1-94e4376a-a1c1-441a-8b41-af5c86ee39d0/sectionGroups\",\"createdBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"lastModifiedBy\":{\"user\":{\"id\":\"6b4fa8ea-7e6e-486e-a8f4-d00a5b23488c\",\"displayName\":\"MOD Administrator\"}},\"links\":{\"oneNoteClientUrl\":{\"href\":\"onenote:https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"},\"oneNoteWebUrl\":{\"href\":\"https://m365x751487-my.sharepoint.com/personal/admin_m365x751487_onmicrosoft_com/Documents/Notebooks/My%20Notebook%20-442293399\"}}}}]}";
         BatchResponseContent batchresponse = new DefaultSerializer(mock(ILogger.class)).deserializeObject(responsebody, BatchResponseContent.class);
-        Iterator<BatchResponseStep<?>> it = batchresponse.responses.iterator();
+        Iterator<BatchResponseStep<JsonElement>> it = batchresponse.responses.iterator();
         while(it.hasNext()) {
             BatchResponseStep<?> entry = it.next();
             assertTrue(entry.id != null && entry.body !=null);
@@ -93,4 +97,21 @@ public void getResponseWithIdReturnsNullOnEmptyResponses()
         final BatchResponseContent batchResponse = new BatchResponseContent();
         assertNull(batchResponse.getResponseById("id"));
     }
+    @Test
+    public void deserializesErrorsProperly() {
+        String responsebody = "{\"responses\":[{\"id\":\"1\",\"status\":400,\"headers\":{\"Cache-Control\":\"no-cache\",\"x-ms-resource-unit\":\"1\",\"Content-Type\":\"application/json\"},\"body\":{\"error\":{\"code\":\"Request_BadRequest\",\"message\":\"Avalueisrequiredforproperty'displayName'ofresource'User'.\",\"innerError\":{\"date\":\"2021-02-02T19:19:38\",\"request-id\":\"408b8e64-4047-4c97-95b6-46e9f212ab48\",\"client-request-id\":\"102910da-260c-3028-0fb3-7d6903a02622\"}}}}]}";
+        ISerializer serializer = new DefaultSerializer(mock(ILogger.class));
+        BatchResponseContent batchresponse = serializer.deserializeObject(responsebody, BatchResponseContent.class);
+        assertThrows(GraphServiceException.class, () -> {
+            final Object body = batchresponse.getResponseById("1").getDeserializedBody(serializer, BatchRequestContent.class);
+        });
+        try {
+            final Object body = batchresponse.getResponseById("1").getDeserializedBody(serializer, BatchRequestContent.class);
+        } catch(GraphServiceException ex) {
+            final GraphErrorResponse response = ex.getError();
+            assertNotNull(response);
+            assertNotNull(response.error);
+            assertNotNull(response.error.message);
+        }
+    }
 }

From 92cb5ec91d20878aea12b54297f2399becb7571f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 16:53:55 -0500
Subject: [PATCH 167/213] - improves api surface by removing the need to pass
 the serializer

---
 .../com/microsoft/graph/content/BatchRequest.java | 15 +++++++++++++--
 .../graph/content/BatchResponseStep.java          |  7 ++++---
 .../graph/content/BatchResponseContentTest.java   |  8 ++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequest.java b/src/main/java/com/microsoft/graph/content/BatchRequest.java
index 73030036c..ce65cdb42 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequest.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequest.java
@@ -57,7 +57,9 @@ public BatchRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient
     @Nullable
     public BatchResponseContent post(@Nonnull final BatchRequestContent content) throws ClientException {
         this.setHttpMethod(HttpMethod.POST);
-        return this.getClient().getHttpProvider().send(this, BatchResponseContent.class, content);
+        final BatchResponseContent response = this.getClient().getHttpProvider().send(this, BatchResponseContent.class, content);
+        setSerializerOnSteps(response);
+        return response;
     }
     /**
      * Send this request
@@ -69,6 +71,15 @@ public BatchResponseContent post(@Nonnull final BatchRequestContent content) thr
     @Nullable
     public java.util.concurrent.CompletableFuture<BatchResponseContent> postAsync(@Nonnull final BatchRequestContent content) throws ClientException {
         this.setHttpMethod(HttpMethod.POST);
-        return this.getClient().getHttpProvider().sendAsync(this, BatchResponseContent.class, content);
+        return this.getClient().getHttpProvider().sendAsync(this, BatchResponseContent.class, content).thenApply(response -> {
+            setSerializerOnSteps(response);
+            return response;
+        });
+    }
+    private void setSerializerOnSteps(final BatchResponseContent response) {
+        if(response.responses != null)
+            for(final BatchResponseStep<?> step : response.responses) {
+                step.serializer = this.getClient().getSerializer();
+            }
     }
 }
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
index a51da4ea6..c107ab7e2 100644
--- a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
@@ -41,20 +41,21 @@ public class BatchResponseStep<T> extends BatchStep<T> {
     @Expose
     @SerializedName("status")
     public int status;
+    /** Serializer to use for response deserialization */
+    protected ISerializer serializer;
 
     /**
      * Returned the deserialized response body of the current step
      * @param <T2> type of the response body
-     * @param serializer serializer to use for deserialization. graphClient.getSerializer()
      * @param resultClass class of the resulting response body
      * @return the deserialized response body
      * @throws GraphServiceException when a bad request was sent
      * @throws GraphFatalServiceException when the service did not complete the operation as expected because of an internal error
      */
     @Nullable
-    public <T2> T2 getDeserializedBody(@Nonnull final ISerializer serializer, @Nonnull final Class<T2> resultClass) throws GraphServiceException, GraphFatalServiceException {
+    public <T2> T2 getDeserializedBody(@Nonnull final Class<T2> resultClass) throws GraphServiceException, GraphFatalServiceException {
         Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
-        if(body == null || !(body instanceof JsonElement)) return null;
+        if(serializer == null || body == null || !(body instanceof JsonElement)) return null;
 
         final GraphErrorResponse error = serializer.deserializeObject((JsonElement)body, GraphErrorResponse.class);
         if(error == null || error.error == null) {
diff --git a/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
index 842505db5..27ae876e5 100644
--- a/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
@@ -102,11 +102,15 @@ public void deserializesErrorsProperly() {
         String responsebody = "{\"responses\":[{\"id\":\"1\",\"status\":400,\"headers\":{\"Cache-Control\":\"no-cache\",\"x-ms-resource-unit\":\"1\",\"Content-Type\":\"application/json\"},\"body\":{\"error\":{\"code\":\"Request_BadRequest\",\"message\":\"Avalueisrequiredforproperty'displayName'ofresource'User'.\",\"innerError\":{\"date\":\"2021-02-02T19:19:38\",\"request-id\":\"408b8e64-4047-4c97-95b6-46e9f212ab48\",\"client-request-id\":\"102910da-260c-3028-0fb3-7d6903a02622\"}}}}]}";
         ISerializer serializer = new DefaultSerializer(mock(ILogger.class));
         BatchResponseContent batchresponse = serializer.deserializeObject(responsebody, BatchResponseContent.class);
+        if(batchresponse != null && batchresponse.responses != null) // this is done by the batch request in the fluent API
+            for(final BatchResponseStep<?> step : batchresponse.responses) {
+                step.serializer = serializer;
+            }
         assertThrows(GraphServiceException.class, () -> {
-            final Object body = batchresponse.getResponseById("1").getDeserializedBody(serializer, BatchRequestContent.class);
+            final Object body = batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
         });
         try {
-            final Object body = batchresponse.getResponseById("1").getDeserializedBody(serializer, BatchRequestContent.class);
+            final Object body = batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
         } catch(GraphServiceException ex) {
             final GraphErrorResponse response = ex.getError();
             assertNotNull(response);

From 2cc944515e138c12294097a69b2bb1055869e4fa Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Feb 2021 17:08:32 -0500
Subject: [PATCH 168/213] - fixes linting issues

---
 .../graph/content/BatchRequestContent.java     | 18 ++++++++++++++----
 .../graph/content/BatchRequestStep.java        |  2 ++
 .../graph/content/BatchResponseContent.java    |  1 +
 .../graph/content/BatchResponseStep.java       |  1 +
 .../com/microsoft/graph/content/BatchStep.java |  1 +
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
index 1d8251f4c..8a6f7d163 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Matcher;
@@ -46,6 +47,7 @@
 public class BatchRequestContent {
     /** Steps part of the batch request */
     @Expose
+    @Nullable
     @SerializedName("requests")
     public List<BatchRequestStep<?>> requests;
 
@@ -90,6 +92,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
      * @param dependsOnRequestsIds the ids of steps this request depends on
      * @return the id of the step that was just added to the batch
      */
+    @Nonnull
     public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonnull final HttpMethod httpMethod, @Nullable final T serializableBody, @Nullable final String ...dependsOnRequestsIds) {
         Objects.requireNonNull(request, "request parameter cannot be null");
         Objects.requireNonNull(httpMethod, "httpMethod parameter cannot be null");
@@ -106,7 +109,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
         final BatchRequestStep<T> step = new BatchRequestStep<T>() {{
             url = protocolAndHostReplacementMatcher.replaceAll("");
             body = serializableBody;
-            method = httpMethod.toString().toUpperCase();
+            method = httpMethod.toString().toUpperCase(Locale.getDefault());
             dependsOn = dependsOnRequestsIds != null && dependsOnRequestsIds.length > 0 ? new HashSet<String>(Arrays.asList(dependsOnRequestsIds)) : null;
             id = getNextRequestId();
         }};
@@ -114,7 +117,7 @@ public <T> String addBatchRequestStep(@Nonnull final IHttpRequest request, @Nonn
         if(!request.getHeaders().isEmpty()) {
             step.headers = new HashMap<>();
             for(final HeaderOption headerOption : request.getHeaders())
-                step.headers.putIfAbsent(headerOption.getName().toLowerCase(), headerOption.getValue().toString());
+                step.headers.putIfAbsent(headerOption.getName().toLowerCase(Locale.getDefault()), headerOption.getValue().toString());
         }
         if(step.body != null && step.body instanceof IJsonBackedObject &&
             (step.headers == null || !step.headers.containsKey(contentTypeHeaderKey))) {
@@ -163,8 +166,15 @@ public <T> BatchRequestStep<T> getStepById(@Nonnull final String stepId) {
         }
         return null;
     }
-    private static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
-    private String getNextRequestId() {
+    /** pattern to replace the protocol and host part of the request if specified */
+    @Nonnull
+    protected static final Pattern protocolAndHostReplacementPattern = Pattern.compile("(?i)^http[s]?:\\/\\/graph\\.microsoft\\.com\\/(?>v1\\.0|beta)\\/?"); // (?i) case insensitive
+    /**
+     * Generates a randomly available request id
+     * @return a random request id
+     */
+    @Nonnull
+    protected String getNextRequestId() {
         String requestId;
         do {
             requestId = Integer.toString(ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE));
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
index 022a63a2c..cb6ae415a 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestStep.java
@@ -37,10 +37,12 @@ public class BatchRequestStep<T> extends BatchStep<T> {
     @SerializedName("url")
     public String url;
     /** The HTTP method to use to execute the request */
+    @Nullable
     @Expose
     @SerializedName("method")
     public String method;
     /** The IDs of the steps this step depends on before being executed */
+    @Nullable
     @Expose
     @SerializedName("dependsOn")
     public HashSet<String> dependsOn;
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
index ab06e99ee..fe8022524 100644
--- a/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseContent.java
@@ -35,6 +35,7 @@
 /** Respresents the result of a JSON batch request */
 public class BatchResponseContent {
     /** Responses to the steps from the request */
+    @Nullable
     @Expose
     @SerializedName("responses")
     public List<BatchResponseStep<JsonElement>> responses;
diff --git a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
index c107ab7e2..feb1d13a1 100644
--- a/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchResponseStep.java
@@ -42,6 +42,7 @@ public class BatchResponseStep<T> extends BatchStep<T> {
     @SerializedName("status")
     public int status;
     /** Serializer to use for response deserialization */
+    @Nullable
     protected ISerializer serializer;
 
     /**
diff --git a/src/main/java/com/microsoft/graph/content/BatchStep.java b/src/main/java/com/microsoft/graph/content/BatchStep.java
index b35c24821..89773904e 100644
--- a/src/main/java/com/microsoft/graph/content/BatchStep.java
+++ b/src/main/java/com/microsoft/graph/content/BatchStep.java
@@ -42,6 +42,7 @@ public abstract class BatchStep<T> {
     @SerializedName("headers")
     public HashMap<String, String> headers;
     /** The body of request/response for the step */
+    @Nullable
     @Expose
     @SerializedName("body")
     public T body;

From 5b46d7db0001b5f3fc178dbb6580fe9d15aa507a Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 3 Feb 2021 13:59:58 -0500
Subject: [PATCH 169/213] - improves header management for http response

---
 src/main/java/com/microsoft/graph/Util.java   |  29 ----
 .../ChunkedUploadResponseHandler.java         |  33 ++--
 .../com/microsoft/graph/core/Constants.java   |   4 -
 .../graph/http/CoreHttpProvider.java          | 156 +++++++++---------
 .../graph/http/GraphServiceException.java     |  47 ++++--
 .../graph/http/HttpResponseHeadersHelper.java |  53 ------
 .../graph/serializer/DefaultSerializer.java   |  19 +--
 7 files changed, 133 insertions(+), 208 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/Util.java
 delete mode 100644 src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java

diff --git a/src/main/java/com/microsoft/graph/Util.java b/src/main/java/com/microsoft/graph/Util.java
deleted file mode 100644
index 9ec86d861..000000000
--- a/src/main/java/com/microsoft/graph/Util.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.microsoft.graph;
-
-import java.io.Closeable;
-
-import javax.annotation.Nullable;
-
-/**
- * Class with commonly used utility methods.<br>
- * <b>Note</b>: This class is meant for internal SDK use only and SDK users should not take a
- * dependency on it.
- */
-public final class Util {
-    private Util() {}
-
-    /**
-     * Closes a {@code Closeable} quietly, i.e. ignores any exceptions thrown when {@code close()}.
-     * @param closeable The {@code Closeable} instance to be quietly closed.
-     */
-    public static void closeQuietly(@Nullable Closeable closeable) {
-        if (closeable == null) {
-            return;
-        }
-        try {
-            closeable.close();
-        } catch (Exception e) {
-            // we don't care much
-        }
-    }
-}
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index dbbe68ccc..ba7efc8ab 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -25,10 +25,8 @@
 import com.google.common.io.ByteStreams;
 
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.http.GraphServiceException;
 import com.microsoft.graph.http.HttpResponseCode;
-import com.microsoft.graph.http.HttpResponseHeadersHelper;
 import com.microsoft.graph.http.IHttpRequest;
 import com.microsoft.graph.http.IStatefulResponseHandler;
 import com.microsoft.graph.logger.ILogger;
@@ -37,12 +35,12 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 import static com.microsoft.graph.http.HttpResponseCode.HTTP_OK;
 
@@ -53,8 +51,6 @@
  */
 public class ChunkedUploadResponseHandler<UploadType>
 		implements IStatefulResponseHandler<ChunkedUploadResult<UploadType>, UploadType> {
-
-	private final static HttpResponseHeadersHelper  responseHeadersHelper = new HttpResponseHeadersHelper();
 	/**
 	 * The expected deserialized upload type
 	 */
@@ -107,25 +103,24 @@ public ChunkedUploadResult<UploadType> generateResult(
 							response, logger));
 		} else if (response.code() >= HTTP_OK
 				&& response.code() < HttpResponseCode.HTTP_MULTIPLE_CHOICES) {
-			final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
-			final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
-			final String location = headers.get("Location");
-			if (contentType != null
-					&& contentType.contains(Constants.JSON_CONTENT_TYPE)) {
-				return parseJsonUploadResult(response, serializer, logger);
-			} else if (location != null) {
-				logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
-				return new ChunkedUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
-			} else {
-				logger.logDebug("Upload session returned an unexpected response");
-			}
+            try(final ResponseBody body = response.body()) {
+                final String location = response.headers().get("Location");
+                if (body.contentType() != null && body.contentType().subtype().contains("json")) {
+                    return parseJsonUploadResult(body, serializer, logger);
+                } else if (location != null) {
+                    logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
+                    return new ChunkedUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
+                } else {
+                    logger.logDebug("Upload session returned an unexpected response");
+                }
+            }
 		}
 		return new ChunkedUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
 	}
 
 	@Nonnull
-	private ChunkedUploadResult<UploadType> parseJsonUploadResult(@Nonnull Response response, @Nonnull ISerializer serializer, @Nonnull ILogger logger) throws IOException {
-		try (final InputStream in = response.body().byteStream()) {
+	private ChunkedUploadResult<UploadType> parseJsonUploadResult(@Nonnull final ResponseBody responseBody, @Nonnull final ISerializer serializer, @Nonnull final ILogger logger) throws IOException {
+		try (final InputStream in = responseBody.byteStream()) {
 			final byte[] responseBytes = ByteStreams.toByteArray(in);
 			final IUploadSession session = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), uploadSessionClass);
 
diff --git a/src/main/java/com/microsoft/graph/core/Constants.java b/src/main/java/com/microsoft/graph/core/Constants.java
index 651cb996f..5bc17f440 100644
--- a/src/main/java/com/microsoft/graph/core/Constants.java
+++ b/src/main/java/com/microsoft/graph/core/Constants.java
@@ -16,10 +16,6 @@ private Constants() {
 	 * The content type for JSON responses
 	 */
     public static final String JSON_CONTENT_TYPE = "application/json";
-    /**
-	 * The content type for TEXT responses
-	 */
-	public static final String TEXT_CONTENT_TYPE = "text/plain";
 	/**
 	 * The binary content type header's value
 	 */
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index a108ea951..c17296241 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -54,15 +54,13 @@
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 import okio.BufferedSink;
 
-import static com.microsoft.graph.Util.closeQuietly;
-
 /**
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
  */
 public class CoreHttpProvider implements IHttpProvider {
-	private final static HttpResponseHeadersHelper responseHeadersHelper = new HttpResponseHeadersHelper();
 	/**
 	 * The serializer
 	 */
@@ -376,86 +374,88 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                                                                     final Class<Result> resultClass,
                                                                     final Body serializable,
                                                                     final IStatefulResponseHandler<Result, DeserializeType> handler) {
-		try {
-            InputStream in = null;
-            boolean isBinaryStreamInput = false;
+        try(final ResponseBody body = response.body()) {
             try {
+                InputStream in = null;
+                boolean isBinaryStreamInput = false;
+                try {
 
-                // Call being executed
+                    // Call being executed
 
 
-                if (handler != null) {
-                    handler.configConnection(response);
-                }
+                    if (handler != null) {
+                        handler.configConnection(response);
+                    }
 
-                logger.logDebug(String.format(Locale.ROOT, "Response code %d, %s",
-                        response.code(),
-                        response.message()));
+                    logger.logDebug(String.format(Locale.ROOT, "Response code %d, %s",
+                            response.code(),
+                            response.message()));
 
-                if (handler != null) {
-                    logger.logDebug("StatefulResponse is handling the HTTP response.");
-                    return handler.generateResult(
-                            request, response, this.serializer, this.logger);
-                }
+                    if (handler != null) {
+                        logger.logDebug("StatefulResponse is handling the HTTP response.");
+                        return handler.generateResult(
+                                request, response, this.serializer, this.logger);
+                    }
 
-                if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
-                    logger.logDebug("Handling error response");
-                    in = response.body().byteStream();
-                    handleErrorResponse(request, serializable, response);
-                }
+                    if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+                        logger.logDebug("Handling error response");
+                        in = body.byteStream();
+                        handleErrorResponse(request, serializable, response);
+                    }
 
-                if (response.code() == HttpResponseCode.HTTP_NOBODY
-                        || response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
-                    logger.logDebug("Handling response with no body");
-                    return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
-                }
+                    final Map<String, List<String>> responseHeaders = response.headers().toMultimap();
 
-                if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
-                    logger.logDebug("Handling accepted response");
-                    return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
-                }
+                    if (response.code() == HttpResponseCode.HTTP_NOBODY
+                            || response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
+                        logger.logDebug("Handling response with no body");
+                        return handleEmptyResponse(responseHeaders, resultClass);
+                    }
 
-                in = new BufferedInputStream(response.body().byteStream());
-
-                final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
-
-				if (response.body() == null || response.body().contentLength() == 0)
-					return null;
-
-                final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
-                if (contentType != null && resultClass != InputStream.class &&
-                            contentType.contains(Constants.JSON_CONTENT_TYPE)) {
-                    logger.logDebug("Response json");
-                    return handleJsonResponse(in, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
-                } else if (resultClass == InputStream.class) {
-                    logger.logDebug("Response binary");
-                    isBinaryStreamInput = true;
-                    return (Result) handleBinaryStream(in);
-                } else if (contentType != null && resultClass != InputStream.class &&
-                            contentType.contains(Constants.TEXT_CONTENT_TYPE)) {
-                    return handleRawResponse(in, resultClass);
-                } else {
-                    return null;
-                }
-            } finally {
-                if (!isBinaryStreamInput) {
-                    try{
-                        if (in != null) in.close();
-                    }catch(IOException e) {
-                        logger.logError(e.getMessage(), e);
+                    if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
+                        logger.logDebug("Handling accepted response");
+                        return handleEmptyResponse(responseHeaders, resultClass);
+                    }
+
+                    in = new BufferedInputStream(body.byteStream());
+
+                    if (body == null || body.contentLength() == 0)
+                        return null;
+
+                    if (body.contentType() != null && body.contentType().subtype().contains("json")
+                        && resultClass != InputStream.class) {
+                        logger.logDebug("Response json");
+                        return handleJsonResponse(in, responseHeaders, resultClass);
+                    } else if (resultClass == InputStream.class) {
+                        logger.logDebug("Response binary");
+                        isBinaryStreamInput = true;
+                        return (Result) handleBinaryStream(in);
+                    } else if (body.contentType() != null && resultClass != InputStream.class &&
+                        body.contentType().type().contains("text") &&
+                        body.contentType().subtype().contains("plain")) {
+                        return handleRawResponse(in, resultClass);
+                    } else {
+                        return null;
+                    }
+                } finally {
+                    if (!isBinaryStreamInput) {
+                        try{
+                            if (in != null) in.close();
+                        }catch(IOException e) {
+                            logger.logError(e.getMessage(), e);
+                        }
+                        if (response != null) response.close();
                     }
-                    if (response != null) response.close();
                 }
+            } catch (final GraphServiceException ex) {
+                final boolean shouldLogVerbosely = logger.getLoggingLevel() == LoggerLevel.DEBUG;
+                logger.logError("Graph service exception " + ex.getMessage(shouldLogVerbosely), ex);
+                throw ex;
+            } catch (final Exception ex) {
+                final ClientException clientException = new ClientException("Error during http request",
+                        ex);
+                logger.logError("Error during http request", clientException);
+                throw clientException;
             }
-        } catch (final GraphServiceException ex) {
-            final boolean shouldLogVerbosely = logger.getLoggingLevel() == LoggerLevel.DEBUG;
-            logger.logError("Graph service exception " + ex.getMessage(shouldLogVerbosely), ex);
-            throw ex;
-        } catch (final Exception ex) {
-            final ClientException clientException = new ClientException("Error during http request",
-                    ex);
-            logger.logError("Error during http request", clientException);
-            throw clientException;
         }
     }
     /**
@@ -496,12 +496,7 @@ private <Result> Result handleJsonResponse(final InputStream in, Map<String, Lis
 			return null;
 		}
 
-		try {
-			return serializer.deserializeObject(in, clazz, responseHeaders);
-		} finally {
-			closeQuietly(in);
-		}
-
+        return serializer.deserializeObject(in, clazz, responseHeaders);
     }
     /**
 	 * Handles the cause where the response is a Text object
@@ -538,8 +533,13 @@ private <Result> Result handleRawResponse(final InputStream in, final Class<Resu
 	private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHeaders, final Class<Result> clazz)
         throws UnsupportedEncodingException{
         //Create an empty object to attach the response headers to
-        InputStream in = new ByteArrayInputStream("{}".getBytes(Constants.JSON_ENCODING));
-        return handleJsonResponse(in, responseHeaders, clazz);
+        Result result = null;
+        try(final InputStream in = new ByteArrayInputStream("{}".getBytes(Constants.JSON_ENCODING))) {
+            result = handleJsonResponse(in, responseHeaders, clazz);
+        } catch (IOException ex) {
+            //noop we couldnt close the byte array stream we just opened and its ok
+        }
+        return result;
     }
 
 	private Request convertIHttpRequestToOkHttpRequest(IHttpRequest request) {
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index 8e7ce29cd..eece63096 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.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
@@ -40,21 +40,20 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.TreeMap;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import okhttp3.Headers;
 import okhttp3.Response;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static okhttp3.internal.Util.closeQuietly;
 
 /**
  * An exception from the Graph service
  */
 public class GraphServiceException extends ClientException {
-    private final static HttpResponseHeadersHelper  responseHeadersHelper = new HttpResponseHeadersHelper();
-
     private static final long serialVersionUID = -7416427229421064119L;
 
     /**
@@ -184,7 +183,7 @@ public String getResponseMessage() {
     public String getMessage() {
         return getMessage(verbose);
     }
-    
+
     /**
      * Gets the HTTP status code
      *
@@ -229,7 +228,7 @@ public String getMethod() {
     public String getUrl() {
         return url;
     }
-    
+
     /**
      * Gets the request headers
      * @return the request headers
@@ -370,7 +369,7 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
 
         final int responseCode = response.code();
         final List<String> responseHeaders = new LinkedList<>();
-        final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
+        final Map<String, String> headers = getResponseHeadersAsMapStringString(response);
         for (final String key : headers.keySet()) {
             final String fieldPrefix;
             if (key == null) {
@@ -413,11 +412,8 @@ private static GraphErrorResponse parseErrorResponse(@Nonnull ISerializer serial
             throws IOException {
 
         byte[] responseBytes;
-        InputStream is = response.body().byteStream();
-        try {
+        try(final InputStream is = response.body().byteStream()) {
             responseBytes = ByteStreams.toByteArray(is);
-        } finally {
-            closeQuietly(is);
         }
         GraphErrorResponse error;
         try {
@@ -425,7 +421,7 @@ private static GraphErrorResponse parseErrorResponse(@Nonnull ISerializer serial
             error = serializer.deserializeObject(
                     new ByteArrayInputStream(responseBytes),
                     GraphErrorResponse.class,
-                    responseHeadersHelper.getResponseHeadersAsMapOfStringList(response)
+                    response.headers().toMultimap()
             );
         } catch (final Exception ex) {
             error = new GraphErrorResponse();
@@ -437,4 +433,27 @@ private static GraphErrorResponse parseErrorResponse(@Nonnull ISerializer serial
         }
         return error;
     }
+
+    /**
+     * Gets the response headers from OkHttp Response
+     *
+     * @param response the OkHttp response
+     * @return           the set of headers names and value
+     */
+    @Nonnull
+    protected static Map<String, String> getResponseHeadersAsMapStringString(@Nonnull final Response response) {
+        final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        int index = 0;
+        final Headers responseHeaders = response.headers();
+        while (index < responseHeaders.size()) {
+            final String headerName = responseHeaders.name(index);
+            final String headerValue = responseHeaders.value(index);
+            if (headerName == null || headerValue == null) {
+                break;
+            }
+            headers.put(headerName, headerValue);
+            index++;
+        }
+        return headers;
+    }
 }
diff --git a/src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java b/src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java
deleted file mode 100644
index 5fd0f4788..000000000
--- a/src/main/java/com/microsoft/graph/http/HttpResponseHeadersHelper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.microsoft.graph.http;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.annotation.Nonnull;
-
-import okhttp3.Headers;
-import okhttp3.Response;
-
-/** Internal utility class to help parsing the response headers */
-public class HttpResponseHeadersHelper {
-    /**
-	 * Gets the response headers from OkHttp Response
-	 *
-	 * @param response the OkHttp response
-	 * @return           the set of headers names and value
-	 */
-	@Nonnull
-	public Map<String, String> getResponseHeadersAsMapStringString(@Nonnull final Response response) {
-		final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-		int index = 0;
-		final Headers responseHeaders = response.headers();
-		while (index < responseHeaders.size()) {
-			final String headerName = responseHeaders.name(index);
-			final String headerValue = responseHeaders.value(index);
-			if (headerName == null || headerValue == null) {
-				break;
-			}
-			headers.put(headerName, headerValue);
-			index++;
-		}
-		return headers;
-    }
-    
-    /**
-	 * Gets the response headers from OkHttp Response
-	 *
-	 * @param response the OkHttp response
-	 * @return           the set of headers names and value
-	 */
-	@Nonnull
-	public Map<String, List<String>> getResponseHeadersAsMapOfStringList(@Nonnull final Response response) {
-		final Map<String, List<String>> headerFields = response.headers().toMultimap();
-		// Add the response code
-		final List<String> list = new ArrayList<>();
-		headerFields.put("responseCode", list);
-		return headerFields;
-	}
-}
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index de7087829..63e6e4bfb 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -31,6 +31,7 @@
 
 import com.microsoft.graph.logger.ILogger;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Field;
@@ -44,8 +45,6 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import static com.microsoft.graph.Util.closeQuietly;
-
 /**
  * The default serializer implementation for the SDK
  */
@@ -72,7 +71,6 @@ public DefaultSerializer(@Nonnull final ILogger logger) {
 		this.gson = GsonFactory.getGsonInstance(logger);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
@@ -80,18 +78,17 @@ public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final
 		return deserializeObject(rawElement, clazz, responseHeaders);
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
-		InputStreamReader streamReader = null;
-		try {
-			streamReader = new InputStreamReader(inputStream);
+        T result = null;
+        try (final InputStreamReader streamReader =  new InputStreamReader(inputStream)) {
 			final JsonElement rawElement = gson.fromJson(streamReader, JsonElement.class);
-			return deserializeObject(rawElement, clazz, responseHeaders);
-		} finally {
-			closeQuietly(streamReader);
-		}
+			result = deserializeObject(rawElement, clazz, responseHeaders);
+        } catch (IOException ex) {
+            //noop we couldn't close the stream reader we just opened and it's ok
+        }
+        return result;
 	}
 
 	@SuppressWarnings("unchecked")

From fc072e05cf57da11e93ad65d1bc49216b9b3488c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 3 Feb 2021 14:18:53 -0500
Subject: [PATCH 170/213] - moves the constants to a private place so nobody
 takes a dependency on it

---
 .../com/microsoft/graph/core/Constants.java   | 24 ------------
 .../com/microsoft/graph/http/BaseRequest.java |  2 -
 .../graph/http/CoreHttpProvider.java          | 39 +++++++++++++------
 3 files changed, 27 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/java/com/microsoft/graph/core/Constants.java

diff --git a/src/main/java/com/microsoft/graph/core/Constants.java b/src/main/java/com/microsoft/graph/core/Constants.java
deleted file mode 100644
index 5bc17f440..000000000
--- a/src/main/java/com/microsoft/graph/core/Constants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.microsoft.graph.core;
-
-/** Multi-purpose constants holder used accross the SDK */
-public final class Constants {
-	private Constants() {
-	}
-	/**
-	 * The content type header
-	 */
-	public static final String CONTENT_TYPE_HEADER_NAME = "Content-Type";
-	/**
-	 * The encoding type for getBytes
-	 */
-	public static final String JSON_ENCODING = "UTF-8";
-	/**
-	 * The content type for JSON responses
-	 */
-    public static final String JSON_CONTENT_TYPE = "application/json";
-	/**
-	 * The binary content type header's value
-	 */
-	public static final String BINARY_CONTENT_TYPE = "application/octet-stream";
-}
-
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index d659e706a..a2b0f953c 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -34,11 +34,9 @@
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.QueryOption;
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 
-import java.lang.reflect.Field;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index c17296241..50ee6eed4 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -25,7 +25,6 @@
 import com.google.common.annotations.VisibleForTesting;
 
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.core.Constants;
 import com.microsoft.graph.httpcore.middlewareoption.RedirectOptions;
 import com.microsoft.graph.httpcore.middlewareoption.RetryOptions;
 import com.microsoft.graph.logger.ILogger;
@@ -61,7 +60,23 @@
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
  */
 public class CoreHttpProvider implements IHttpProvider {
-	/**
+    /**
+     * The content type header
+     */
+    private static final String CONTENT_TYPE_HEADER_NAME = "Content-Type";
+    /**
+     * The encoding type for getBytes
+     */
+    private static final String JSON_ENCODING = "UTF-8";
+    /**
+     * The content type for JSON responses
+     */
+    private static final String JSON_CONTENT_TYPE = "application/json";
+    /**
+     * The binary content type header's value
+     */
+    private static final String BINARY_CONTENT_TYPE = "application/octet-stream";
+    /**
 	 * The serializer
 	 */
 	private final ISerializer serializer;
@@ -234,7 +249,7 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 		final List<HeaderOption> requestHeaders = request.getHeaders();
 
 		for(HeaderOption headerOption : requestHeaders) {
-			if(headerOption.getName().equalsIgnoreCase(Constants.CONTENT_TYPE_HEADER_NAME)) {
+			if(headerOption.getName().equalsIgnoreCase(CONTENT_TYPE_HEADER_NAME)) {
 				contenttype = headerOption.getValue().toString();
 				break;
 			}
@@ -248,7 +263,7 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 			if (request.getHttpMethod() == HttpMethod.POST) {
 				bytesToWrite = new byte[0];
 				if(contenttype == null) {
-					contenttype = Constants.BINARY_CONTENT_TYPE;
+					contenttype = BINARY_CONTENT_TYPE;
 				}
 			}
 			else {
@@ -259,15 +274,15 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 			bytesToWrite = (byte[]) serializable;
 
 			// If the user hasn't specified a Content-Type for the request
-			if (!hasHeader(requestHeaders, Constants.CONTENT_TYPE_HEADER_NAME)) {
-				corehttpRequestBuilder.addHeader(Constants.CONTENT_TYPE_HEADER_NAME, Constants.BINARY_CONTENT_TYPE);
-				contenttype = Constants.BINARY_CONTENT_TYPE;
+			if (!hasHeader(requestHeaders, CONTENT_TYPE_HEADER_NAME)) {
+				corehttpRequestBuilder.addHeader(CONTENT_TYPE_HEADER_NAME, BINARY_CONTENT_TYPE);
+				contenttype = BINARY_CONTENT_TYPE;
 			}
 		} else {
 			logger.logDebug("Sending " + serializable.getClass().getName() + " as request body");
 			final String serializeObject = serializer.serializeObject(serializable);
 			try {
-				bytesToWrite = serializeObject.getBytes(Constants.JSON_ENCODING);
+				bytesToWrite = serializeObject.getBytes(JSON_ENCODING);
 			} catch (final UnsupportedEncodingException ex) {
 				final ClientException clientException = new ClientException("Unsupported encoding problem: ",
 						ex);
@@ -276,9 +291,9 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 			}
 
 			// If the user hasn't specified a Content-Type for the request
-			if (!hasHeader(requestHeaders, Constants.CONTENT_TYPE_HEADER_NAME)) {
-				corehttpRequestBuilder.addHeader(Constants.CONTENT_TYPE_HEADER_NAME, Constants.JSON_CONTENT_TYPE);
-				contenttype = Constants.JSON_CONTENT_TYPE;
+			if (!hasHeader(requestHeaders, CONTENT_TYPE_HEADER_NAME)) {
+				corehttpRequestBuilder.addHeader(CONTENT_TYPE_HEADER_NAME, JSON_CONTENT_TYPE);
+				contenttype = JSON_CONTENT_TYPE;
 			}
 		}
 
@@ -534,7 +549,7 @@ private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHe
         throws UnsupportedEncodingException{
         //Create an empty object to attach the response headers to
         Result result = null;
-        try(final InputStream in = new ByteArrayInputStream("{}".getBytes(Constants.JSON_ENCODING))) {
+        try(final InputStream in = new ByteArrayInputStream("{}".getBytes(JSON_ENCODING))) {
             result = handleJsonResponse(in, responseHeaders, clazz);
         } catch (IOException ex) {
             //noop we couldnt close the byte array stream we just opened and its ok

From 46c5bc8c8567d1216f047afca3b68f7a18da36be Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 4 Feb 2021 10:33:13 -0500
Subject: [PATCH 171/213] - upgrades gradle to 6.8.1

---
 android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 gradle/wrapper/gradle-wrapper.properties         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index be52383ef..28ff446a2 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383ef..28ff446a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 36f4f8b156632ac14f9f278752febe9608f114d8 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 28 Jan 2021 15:19:53 -0500
Subject: [PATCH 172/213] - generic IHttpRequest

---
 .../concurrency/ChunkedUploadProvider.java    | 10 +--
 .../concurrency/ChunkedUploadRequest.java     |  3 +-
 .../com/microsoft/graph/core/BaseClient.java  | 56 +++++++++-----
 .../graph/core/CustomRequestBuilder.java      | 15 ++--
 .../com/microsoft/graph/core/IBaseClient.java |  5 +-
 .../http/BaseActionCollectionRequest.java     |  6 +-
 .../BaseActionCollectionRequestBuilder.java   |  5 +-
 .../graph/http/BaseActionRequestBuilder.java  |  5 +-
 ...BaseCollectionReferenceRequestBuilder.java |  6 +-
 .../graph/http/BaseCollectionRequest.java     | 16 +---
 .../http/BaseCollectionRequestBuilder.java    |  4 +-
 .../BaseCollectionWithReferencesRequest.java  |  7 +-
 ...ollectionWithReferencesRequestBuilder.java |  8 +-
 .../http/BaseDeltaCollectionRequest.java      |  5 +-
 .../http/BaseEntityCollectionRequest.java     |  7 +-
 .../http/BaseFunctionCollectionRequest.java   |  7 +-
 .../BaseFunctionCollectionRequestBuilder.java |  2 +-
 .../http/BaseFunctionRequestBuilder.java      |  3 +-
 .../graph/http/BaseReferenceRequest.java      |  5 +-
 .../http/BaseReferenceRequestBuilder.java     | 10 +--
 .../com/microsoft/graph/http/BaseRequest.java | 22 ++----
 .../graph/http/BaseRequestBuilder.java        | 16 ++--
 .../graph/http/BaseStreamRequest.java         | 17 +----
 .../http/BaseVoidActionCollectionRequest.java |  6 +-
 .../graph/http/BaseWithReferenceRequest.java  |  5 +-
 .../http/BaseWithReferenceRequestBuilder.java | 12 ++-
 .../graph/http/CoreHttpProvider.java          |  2 +-
 .../microsoft/graph/http/CustomRequest.java   |  4 +-
 .../http/GraphFatalServiceException.java      |  8 +-
 .../graph/http/GraphServiceException.java     |  2 +-
 .../microsoft/graph/http/IHttpProvider.java   |  9 +--
 .../microsoft/graph/http/IHttpRequest.java    | 74 ++++++++++---------
 .../graph/http/IHttpStreamRequest.java        |  6 +-
 .../microsoft/graph/http/IRequestBuilder.java | 14 ++--
 .../graph/http/PrimitiveRequest.java          |  5 +-
 .../graph/http/PrimitiveRequestBuilder.java   |  9 +--
 .../serializer/CollectionPageSerializer.java  |  1 +
 .../microsoft/graph/core/BaseClientTests.java | 10 +--
 .../graph/core/GraphServiceClientTest.java    | 12 +--
 .../graph/http/BaseCollectionPageTests.java   |  9 ++-
 .../http/BaseCollectionRequestTests.java      | 14 ++--
 .../graph/http/BaseRequestBuilderTests.java   |  4 +-
 .../graph/http/BaseRequestTests.java          | 14 ++--
 .../graph/http/BaseStreamRequestTests.java    | 10 +--
 .../graph/http/DeltaCollectionPageTests.java  |  2 +
 45 files changed, 197 insertions(+), 275 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
index d3aafbbc3..8e9ce8f33 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
@@ -22,10 +22,6 @@
 
 package com.microsoft.graph.concurrency;
 
-import com.microsoft.graph.concurrency.ChunkedUploadResponseHandler;
-import com.microsoft.graph.concurrency.ChunkedUploadRequest;
-import com.microsoft.graph.concurrency.ChunkedUploadResult;
-import com.microsoft.graph.concurrency.IUploadSession;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.options.Option;
@@ -66,7 +62,7 @@ public class ChunkedUploadProvider<UploadType> {
     /**
      * The client
      */
-    private final IBaseClient client;
+    private final IBaseClient<?> client;
 
     /**
      * The input stream
@@ -103,7 +99,7 @@ public class ChunkedUploadProvider<UploadType> {
      * @param uploadTypeClass the upload type class
      */
     public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nonnull final InputStream inputStream,
                                  final long streamSize,
                                  @Nonnull final Class<UploadType> uploadTypeClass) {
@@ -173,7 +169,7 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable
             }
 
             final ChunkedUploadRequest<UploadType> request =
-                    new ChunkedUploadRequest<UploadType>(this.uploadUrl, this.client, options, buffer, buffRead,
+                    new ChunkedUploadRequest<>(this.uploadUrl, this.client, options, buffer, buffRead,
                             this.readSoFar, this.streamSize);
             final ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
             // TODO: upload should return a future, use sendfuture instead and the futures should be chained with completableFuture.then apply
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
index e0e0f861b..badb00375 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -10,7 +10,6 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
-import com.microsoft.graph.concurrency.ChunkedUploadResponseHandler;
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.http.BaseRequest;
 import com.microsoft.graph.http.HttpMethod;
@@ -56,7 +55,7 @@ public class ChunkedUploadRequest<UploadType> {
      */
     @SuppressWarnings("unchecked")
     protected ChunkedUploadRequest(@Nonnull final String requestUrl,
-                                @Nonnull final IBaseClient client,
+                                @Nonnull final IBaseClient<?> client,
                                 @Nullable final List<? extends Option> options,
                                 @Nonnull final byte[] chunk,
                                 final int chunkSize,
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index d9e4e22fe..0afed810d 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -40,11 +40,13 @@
 import javax.annotation.Nonnull;
 
 import okhttp3.OkHttpClient;
+import okhttp3.Request;
 
 /**
  * A client that communications with an OData service
+ * @param <NativeRequestType> type of a request for the native http client
  */
-public class BaseClient implements IBaseClient {
+public class BaseClient<NativeRequestType> implements IBaseClient<NativeRequestType> {
     /**
 	 * Restricted constructor
 	 */
@@ -86,7 +88,7 @@ public void setServiceRoot(@Nonnull final String value) {
 	 */
 	@Nonnull
 	public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType) {
-		return new CustomRequestBuilder<T>(getServiceRoot() + url, this, null, responseType);
+		return new CustomRequestBuilder<>(getServiceRoot() + url, this, null, responseType);
 	}
 
 	/**
@@ -98,7 +100,7 @@ public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Non
 	 */
 	@Nonnull
 	public CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url) {
-		return new CustomRequestBuilder<JsonElement>(getServiceRoot() + url, this, null,
+		return new CustomRequestBuilder<>(getServiceRoot() + url, this, null,
 				JsonElement.class);
     }
 
@@ -111,23 +113,36 @@ public BatchRequestBuilder batch() {
         return new BatchRequestBuilder(getServiceRoot() + "/$batch", this, null);
     }
 
+    /**
+	 * Gets the builder to start configuring the client
+	 *
+	 * @return builder to start configuring the client
+	 */
+	@Nonnull
+	public static Builder<OkHttpClient, Request> builder() {
+		return builder(OkHttpClient.class, Request.class);
+	}
+
 	/**
 	 * Gets the builder to start configuring the client
 	 *
+     * @param <nativeClient> the type of the native http client
+     * @param <nativeRequest> the type of the native http request
 	 * @return builder to start configuring the client
 	 */
 	@Nonnull
-	public static Builder<OkHttpClient> builder() {
+	public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(Class<nativeClient> nativeClientClass, Class<nativeRequest> nativeRequestClass) {
 		return new Builder<>();
 	}
 
 	/**
 	 * Builder to help configure the Graph service client
      * @param <httpClientType> type of the native http library client
+     * @param <NativeRequestType> type of a request for the native http client
 	 */
-	public static class Builder<httpClientType> {
+	public static class Builder<httpClientType, NativeRequestType> {
 		private ISerializer serializer;
-		private IHttpProvider httpProvider;
+		private IHttpProvider<NativeRequestType> httpProvider;
 		private ILogger logger;
 		private httpClientType httpClient;
 		private IAuthenticationProvider auth;
@@ -160,10 +175,11 @@ private httpClientType getHttpClient() {
 			} else {
 				return httpClient;
 			}
-		}
-		private IHttpProvider getHttpProvider() {
+        }
+        @SuppressWarnings("unchecked")
+		private IHttpProvider<NativeRequestType> getHttpProvider() {
 			if(httpProvider == null) {
-				return new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
+				return (IHttpProvider<NativeRequestType>)new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
 			} else {
 				return httpProvider;
 			}
@@ -177,7 +193,7 @@ private IHttpProvider getHttpProvider() {
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer) {
+		public Builder<httpClientType, NativeRequestType> serializer(@Nonnull final ISerializer serializer) {
 			checkNotNull(serializer, "serializer");
 			this.serializer = serializer;
 			return this;
@@ -191,7 +207,7 @@ public Builder<httpClientType> serializer(@Nonnull final ISerializer serializer)
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpProvider) {
+		public Builder<httpClientType, NativeRequestType> httpProvider(@Nonnull final IHttpProvider<NativeRequestType> httpProvider) {
 			checkNotNull(httpProvider, "httpProvider");
 			this.httpProvider = httpProvider;
 			return this;
@@ -205,7 +221,7 @@ public Builder<httpClientType> httpProvider(@Nonnull final IHttpProvider httpPro
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
+		public Builder<httpClientType, NativeRequestType> logger(@Nonnull final ILogger logger) {
 			checkNotNull(logger, "logger");
 			this.logger = logger;
 			return this;
@@ -219,7 +235,7 @@ public Builder<httpClientType> logger(@Nonnull final ILogger logger) {
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> httpClient(@Nonnull final httpClientType client) {
+		public Builder<httpClientType, NativeRequestType> httpClient(@Nonnull final httpClientType client) {
 			checkNotNull(client, "client");
 			this.httpClient = client;
 			return this;
@@ -232,7 +248,7 @@ public Builder<httpClientType> httpClient(@Nonnull final httpClientType client)
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
+		public Builder<httpClientType, NativeRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
 			checkNotNull(auth, "auth");
 			this.auth = auth;
 			return this;
@@ -248,7 +264,7 @@ public Builder<httpClientType> authenticationProvider(@Nonnull final IAuthentica
 		 *			 if there was an exception creating the client
 		 */
 		@Nonnull
-		protected <ClientType extends BaseClient> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
+		protected <ClientType extends BaseClient<NativeRequestType>> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
             Objects.requireNonNull(instance, "The instance cannot be null");
 			instance.setHttpProvider(this.getHttpProvider());
 			instance.setLogger(this.getLogger());
@@ -264,8 +280,8 @@ protected <ClientType extends BaseClient> ClientType buildClient(@Nonnull Client
 		 *			 if there was an exception creating the client
 		 */
 		@Nonnull
-		public IBaseClient buildClient() throws ClientException {
-			return buildClient(new BaseClient());
+		public IBaseClient<NativeRequestType> buildClient() throws ClientException {
+			return buildClient(new BaseClient<>());
 		}
 	}
 
@@ -284,7 +300,7 @@ protected static void checkNotNull(@Nullable final Object o, @Nonnull final Stri
     /**
      * The HTTP provider instance
      */
-    private IHttpProvider httpProvider;
+    private IHttpProvider<NativeRequestType> httpProvider;
 
     /**
      * The logger
@@ -303,7 +319,7 @@ protected static void checkNotNull(@Nullable final Object o, @Nonnull final Stri
      */
     @Override
     @Nullable
-    public IHttpProvider getHttpProvider() {
+    public IHttpProvider<NativeRequestType> getHttpProvider() {
         return httpProvider;
     }
 
@@ -343,7 +359,7 @@ protected void setLogger(@Nonnull final ILogger logger) {
      *
      * @param httpProvider The HTTP provider
      */
-    protected void setHttpProvider(@Nonnull final IHttpProvider httpProvider) {
+    protected void setHttpProvider(@Nonnull final IHttpProvider<NativeRequestType> httpProvider) {
         checkNotNull(httpProvider, "httpProvider");
         this.httpProvider = httpProvider;
     }
diff --git a/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java b/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
index 1b878a037..6354965b6 100644
--- a/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
@@ -5,7 +5,6 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
-import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.http.BaseRequestBuilder;
 import com.microsoft.graph.http.CustomRequest;
 import com.microsoft.graph.options.Option;
@@ -18,23 +17,23 @@
 public class CustomRequestBuilder<T> extends BaseRequestBuilder<T> {
 	/** Type to use for response deserialization */
 	public final Class<T> responseType;
-	
+
 	/**
 	 * Instanciates a new custom request builder
-	 * 
+	 *
 	 * @param requestUrl the URL to send the request to
 	 * @param client the client to use for the request
 	 * @param requestOptions options to apply to the request
 	 * @param responseType type to use for response deserialization
 	 */
-	public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final List<? extends Option> requestOptions, @Nonnull final Class<T> responseType) {
+	public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final List<? extends Option> requestOptions, @Nonnull final Class<T> responseType) {
 		super(requestUrl, client, requestOptions);
 		this.responseType = responseType;
 	}
-	
+
 	/**
 	 * Builds the request to be executed
-	 * 
+	 *
 	 * @return the request to be executed
 	 * @param requestOptions the options to apply to the request
 	 */
@@ -42,10 +41,10 @@ public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBa
 	public CustomRequest<T> buildRequest(@Nullable final com.microsoft.graph.options.Option... requestOptions) {
 		return buildRequest(getOptions(requestOptions));
 	}
-	
+
 	/**
 	 * Builds the request to be executed
-	 * 
+	 *
 	 * @return the request to be executed
 	 * @param requestOptions the options to apply to the request
 	 */
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index ec49764d7..d695a3258 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -33,8 +33,9 @@
 
 /**
  * A client that communications with an OData service
+ * @param <NativeRequestType> type of a request for the native http client
  */
-public interface IBaseClient {
+public interface IBaseClient<NativeRequestType> {
     /**
      * Gets the service root
      *
@@ -56,7 +57,7 @@ public interface IBaseClient {
      * @return the HTTP provider
      */
     @Nullable
-    IHttpProvider getHttpProvider();
+    IHttpProvider<NativeRequestType> getHttpProvider();
 
     /**
      * Gets the logger
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
index b2d4b8afe..a9c38b4ec 100644
--- a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequest.java
@@ -22,18 +22,14 @@
 
 package com.microsoft.graph.http;
 
-import java.net.URL;
 import java.lang.NoSuchFieldException;
 import java.lang.IllegalAccessException;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.ICollectionResponse;
-import com.microsoft.graph.http.BaseCollectionPage;
 import com.microsoft.graph.options.Option;
 
 /**
@@ -58,7 +54,7 @@ public abstract class BaseActionCollectionRequest<T, T2 extends ICollectionRespo
      * @param collectionRequestBuilderClass the class for the collection request builder
      */
     public BaseActionCollectionRequest(@Nonnull final String requestUrl,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nullable final List<? extends Option> options,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java
index f315271c6..000cac4cd 100644
--- a/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseActionCollectionRequestBuilder.java
@@ -5,12 +5,9 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.BaseRequestBuilder;
 import com.microsoft.graph.options.Option;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -34,7 +31,7 @@ public class BaseActionCollectionRequestBuilder<T, T2 extends BaseRequestBuilder
      */
     public BaseActionCollectionRequestBuilder(
             @Nonnull final String requestUrl,
-            @Nonnull final IBaseClient client,
+            @Nonnull final IBaseClient<?> client,
             @Nullable final List<? extends Option> options,
             @Nonnull final Class<T2> requestBuilderClass,
             @Nonnull final Class<T5> collectionRequestClass
diff --git a/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java
index 46427e0a5..17aff1f98 100644
--- a/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseActionRequestBuilder.java
@@ -5,12 +5,9 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.BaseRequestBuilder;
 import com.microsoft.graph.options.Option;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -28,7 +25,7 @@ public class BaseActionRequestBuilder<T> extends BaseRequestBuilder<T> {
      */
     public BaseActionRequestBuilder(
             @Nonnull final String requestUrl,
-            @Nonnull final IBaseClient client,
+            @Nonnull final IBaseClient<?> client,
             @Nullable final List<? extends Option> options
     ) {
         super(requestUrl, client, options);
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java
index 326a11c37..ae833394c 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionReferenceRequestBuilder.java
@@ -23,10 +23,6 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.options.Option;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -47,7 +43,7 @@ public class BaseCollectionReferenceRequestBuilder<T, T2 extends BaseRequestBuil
      * @param requestBuilderClass the class for the request builder
      * @param collectionRequestClass the class for the collection request
      */
-    public BaseCollectionReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+    public BaseCollectionReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
 										@Nonnull final Class<T2> requestBuilderClass,
 										@Nonnull final Class<T5> collectionRequestClass) {
         super(requestUrl, client, requestOptions, requestBuilderClass, collectionRequestClass);
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index c71dd5a4f..2710d2a43 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -37,8 +37,6 @@
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 
-import okhttp3.Request;
-
 /**
  * A request against a collection
  *
@@ -78,7 +76,7 @@ public abstract class BaseCollectionRequest<T, T2 extends ICollectionResponse<T>
      * @param collectionRequestBuilderClass the class for the collection request builder
      */
     public BaseCollectionRequest(@Nonnull final String requestUrl,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nullable final List<? extends Option> options,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
@@ -418,26 +416,18 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
         baseRequest.setHttpMethod(httpMethod);
         return this;
     }
-    /**
-     * Returns the Request object to be executed
-     * @return the Request object to be executed
-     */
-    @Override
-    @Nullable
-    public Request getHttpRequest() throws ClientException {
-        return baseRequest.getHttpRequest();
-    }
 
     /**
      * Returns the Request object to be executed
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
+     * @param <NativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Override
     @Nullable
-    public <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+    public <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
         return baseRequest.getHttpRequest(serializedObject);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
index 9d2402612..2428cefc7 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
@@ -30,7 +30,7 @@ public class BaseCollectionRequestBuilder<T, T2 extends BaseRequestBuilder<T>,
      * @param requestBuilderClass the class for the request builder
      * @param collectionRequestClass the class for the collection request
      */
-	public BaseCollectionRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+	public BaseCollectionRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
                                         @Nonnull final Class<T2> requestBuilderClass,
 										@Nonnull final Class<T5> collectionRequestClass) {
         super(requestUrl, client, requestOptions);
@@ -67,7 +67,7 @@ public T5 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
 
     /**
      * Gets a builder to request an item within a collection
-     * 
+     *
      * @return builder to request an item within a collection
      * @param id identifier for the item
      */
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java
index 82aec19ca..3552c5b67 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequest.java
@@ -23,11 +23,6 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.options.Option;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -54,7 +49,7 @@ public abstract class BaseCollectionWithReferencesRequest<T,T2 extends BaseWithR
      * @param collectionPageClass the class for the collection page
      * @param collectionWithReferencesRequestBuilderClass the class for the request builder
      */
-    public BaseCollectionWithReferencesRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+    public BaseCollectionWithReferencesRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
                                                 @Nonnull final Class<T5> collectionResponseClass,
                                                 @Nonnull final Class<T6> collectionPageClass,
                                                 @Nonnull final Class<? extends BaseCollectionWithReferencesRequestBuilder<T, T2, T3, T4, T5, T6, ? extends BaseCollectionWithReferencesRequest<T, T2, T3, T4, T5, T6, T7>, ? extends BaseCollectionReferenceRequestBuilder<T, T3, T5, T6, ? extends BaseCollectionWithReferencesRequest<T, T2, T3, T4, T5, T6, T7>>>> collectionWithReferencesRequestBuilderClass) {
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
index bc647d28b..e9005b43c 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
@@ -23,13 +23,7 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.options.Option;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Arrays;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.annotation.Nullable;
@@ -56,7 +50,7 @@ public abstract class BaseCollectionWithReferencesRequestBuilder<T, T2 extends B
      * @param collectionWithReferencesRequestClass the class for the collection request
      * @param collectionWithReferenceRequestBuilderClass the class for the collection request builder
      */
-    public BaseCollectionWithReferencesRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+    public BaseCollectionWithReferencesRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
                                                     @Nonnull final Class<T3> referenceRequestBuilderClass,
                                                     @Nonnull final Class<T7> collectionWithReferencesRequestClass,
                                                     @Nonnull final Class<T8> collectionWithReferenceRequestBuilderClass) {
diff --git a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
index 9a2c0410f..25887dd2a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
@@ -32,10 +32,7 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
-import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.ICollectionResponse;
-import com.microsoft.graph.http.BaseCollectionPage;
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 
@@ -61,7 +58,7 @@ public abstract class BaseDeltaCollectionRequest<T, T2 extends ICollectionRespon
      * @param collectionRequestBuilderClass the class for the collection request builder
      */
     public BaseDeltaCollectionRequest(@Nonnull final String requestUrl,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nullable final List<? extends Option> options,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
diff --git a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
index e0b405115..fd937b64d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
@@ -22,17 +22,12 @@
 
 package com.microsoft.graph.http;
 
-import java.net.URL;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.ICollectionResponse;
-import com.microsoft.graph.http.BaseCollectionPage;
 import com.microsoft.graph.options.Option;
 
 /**
@@ -57,7 +52,7 @@ public abstract class BaseEntityCollectionRequest<T, T2 extends ICollectionRespo
      * @param collectionRequestBuilderClass the class for the collection request builder
      */
     public BaseEntityCollectionRequest(@Nonnull final String requestUrl,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nullable final List<? extends Option> options,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
index c54e3c634..19ca7a08f 100644
--- a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequest.java
@@ -22,17 +22,12 @@
 
 package com.microsoft.graph.http;
 
-import java.net.URL;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.ICollectionResponse;
-import com.microsoft.graph.http.BaseCollectionPage;
 import com.microsoft.graph.options.Option;
 
 /**
@@ -57,7 +52,7 @@ public abstract class BaseFunctionCollectionRequest<T, T2 extends ICollectionRes
      * @param collectionRequestBuilderClass the class for the collection request builder
      */
     public BaseFunctionCollectionRequest(@Nonnull final String requestUrl,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nullable final List<? extends Option> options,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java
index 68b856fc3..58d409ee6 100644
--- a/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionCollectionRequestBuilder.java
@@ -39,7 +39,7 @@ public class BaseFunctionCollectionRequestBuilder<T, T2 extends BaseRequestBuild
      */
     public BaseFunctionCollectionRequestBuilder(
             @Nonnull final String requestUrl,
-            @Nonnull final IBaseClient client,
+            @Nonnull final IBaseClient<?> client,
             @Nullable final List<? extends Option> options,
             @Nonnull final Class<T2> requestBuilderClass,
             @Nonnull final Class<T5> collectionRequestClass
diff --git a/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java
index 7de5a7e65..d8555d9af 100644
--- a/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseFunctionRequestBuilder.java
@@ -5,7 +5,6 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.BaseRequestBuilder;
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.Option;
 
@@ -35,7 +34,7 @@ public class BaseFunctionRequestBuilder<T> extends BaseRequestBuilder<T> {
      */
     public BaseFunctionRequestBuilder(
             @Nonnull final String requestUrl,
-            @Nonnull final IBaseClient client,
+            @Nonnull final IBaseClient<?> client,
             @Nullable final List<? extends Option> options
     ) {
         super(requestUrl, client, options);
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
index e93089a06..13d5d3f6e 100644
--- a/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequest.java
@@ -24,9 +24,6 @@
 
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.options.Option;
-
-import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -46,7 +43,7 @@ public abstract class BaseReferenceRequest<T> extends BaseRequest<T> {
      * @param requestOptions the options for this request
      * @param entityType     the class for the entity
      */
-    public BaseReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> entityType) {
+    public BaseReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> entityType) {
         super(requestUrl, client, requestOptions, entityType);
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
index 768a49cd1..aea14506c 100644
--- a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.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
@@ -23,10 +23,8 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.options.Option;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -46,7 +44,7 @@ public abstract class BaseReferenceRequestBuilder<T, T2 extends BaseReferenceReq
      * @param requestOptions the options for this request
      * @param referenceRequestClass the class to use to build the request
      */
-    public BaseReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T2> referenceRequestClass) {
+    public BaseReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T2> referenceRequestClass) {
         super(requestUrl, client, requestOptions);
         this.refRequestClass = referenceRequestClass;
     }
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index a2b0f953c..183ab0a5d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -23,7 +23,6 @@
 package com.microsoft.graph.http;
 
 import okhttp3.HttpUrl;
-import okhttp3.Request;
 import okhttp3.HttpUrl.Builder;
 
 import com.microsoft.graph.core.IBaseClient;
@@ -77,7 +76,7 @@ public abstract class BaseRequest<T> implements IHttpRequest {
     /**
      * The backing client for this request
      */
-    private final IBaseClient client;
+    private final IBaseClient<?> client;
 
     /**
      * The header options for this request
@@ -138,7 +137,7 @@ public abstract class BaseRequest<T> implements IHttpRequest {
      * @param responseClass the class for the response
      */
     public BaseRequest(@Nonnull final String requestUrl,
-                       @Nonnull final IBaseClient client,
+                       @Nonnull final IBaseClient<?> client,
                        @Nullable final List<? extends Option> options,
                        @Nonnull final Class<? extends T> responseClass) {
         this.requestUrl = requestUrl;
@@ -197,28 +196,19 @@ public URL getRequestUrl() {
 		return null;
     }
 
-    /**
-     * Returns the Request object to be executed
-     * @return the Request object to be executed
-     */
-    @Override
-    @Nullable
-    public Request getHttpRequest() throws ClientException {
-        return getHttpRequest(null);
-    }
-
     /**
      * Returns the Request object to be executed
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
+     * @param <NativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Override
     @Nullable
     @SuppressWarnings("unchecked")
-    public <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
-        return client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject);
+    public <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+        return (NativeRequestType)client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject);
     }
 
     private String addFunctionParameters() {
@@ -486,7 +476,7 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
      * @return the client
      */
     @Nonnull
-    public IBaseClient getClient() {
+    public IBaseClient<?> getClient() {
         return client;
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
index 638ddae48..aff5e8795 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.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
@@ -41,7 +41,7 @@ public abstract class BaseRequestBuilder<T> implements IRequestBuilder {
     /**
      * The backing client for this request.
      */
-    private final IBaseClient client;
+    private final IBaseClient<?> client;
 
     /**
      * The URL for this request
@@ -62,7 +62,7 @@ public abstract class BaseRequestBuilder<T> implements IRequestBuilder {
      */
     public BaseRequestBuilder(
             @Nonnull final String requestUrl,
-            @Nonnull final IBaseClient client,
+            @Nonnull final IBaseClient<?> client,
             @Nullable final List<? extends Option> options
     ) {
         this.requestUrl = requestUrl;
@@ -78,7 +78,7 @@ public BaseRequestBuilder(
      * @return the client
      */
     @Nullable
-    public IBaseClient getClient() {
+    public IBaseClient<?> getClient() {
         return client;
     }
 
@@ -100,8 +100,8 @@ public String getRequestUrl() {
      */
     @Nonnull
     public List<? extends Option> getOptions(@Nonnull final Option... requestOptions) {
-        return Collections.unmodifiableList(requestOptions != null && requestOptions.length > 0 ? 
-                Arrays.asList(requestOptions) 
+        return Collections.unmodifiableList(requestOptions != null && requestOptions.length > 0 ?
+                Arrays.asList(requestOptions)
                 : options);
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
index 516439bf9..0918b008d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -29,8 +29,6 @@
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 
-import okhttp3.Request;
-
 import java.io.InputStream;
 import java.net.URL;
 import java.util.List;
@@ -59,7 +57,7 @@ public abstract class BaseStreamRequest<T> implements IHttpStreamRequest {
      * @param responseClass the class for the response
      */
     public BaseStreamRequest(@Nonnull final String requestUrl,
-                             @Nonnull final IBaseClient client,
+                             @Nonnull final IBaseClient<?> client,
                              @Nullable final List<? extends Option> options,
                              @Nonnull final Class<T> responseClass) {
         baseRequest = new BaseRequest<T>(requestUrl, client, options, responseClass) {
@@ -293,26 +291,17 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
         return this;
     }
 
-    /**
-     * Returns the Request object to be executed
-     * @return the Request object to be executed
-     */
-    @Override
-    @Nullable
-    public Request getHttpRequest() throws ClientException {
-        return baseRequest.getHttpRequest();
-    }
-
     /**
      * Returns the Request object to be executed
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
+     * @param <NativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Override
     @Nullable
-    public <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+    public <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
         return baseRequest.getHttpRequest(serializedObject);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
index d358815c4..c9108640a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseVoidActionCollectionRequest.java
@@ -22,18 +22,14 @@
 
 package com.microsoft.graph.http;
 
-import java.net.URL;
 import java.lang.NoSuchFieldException;
 import java.lang.IllegalAccessException;
-import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.ICollectionResponse;
-import com.microsoft.graph.http.BaseCollectionPage;
 import com.microsoft.graph.options.Option;
 
 /**
@@ -58,7 +54,7 @@ public abstract class BaseVoidActionCollectionRequest<T, T2 extends ICollectionR
      * @param collectionRequestBuilderClass the class for the collection request builder
      */
     public BaseVoidActionCollectionRequest(@Nonnull final String requestUrl,
-                                 @Nonnull final IBaseClient client,
+                                 @Nonnull final IBaseClient<?> client,
                                  @Nullable final List<? extends Option> options,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
index 279b05078..51caf56e5 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
@@ -24,11 +24,8 @@
 
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.options.Option;
 import com.microsoft.graph.serializer.IJsonBackedObject;
 
-import java.util.List;
-
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
@@ -47,7 +44,7 @@ public abstract class BaseWithReferenceRequest<T> extends BaseRequest<T> {
      * @param requestOptions the options for this request
      * @param entityClass     the class for the entity
      */
-    public BaseWithReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+    public BaseWithReferenceRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
                                     @Nonnull final Class<T> entityClass) {
         super(requestUrl, client, requestOptions, entityClass);
     }
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
index a2661564e..a87e67a43 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.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
@@ -23,10 +23,8 @@
 package com.microsoft.graph.http;
 
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.options.Option;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.List;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -49,7 +47,7 @@ public abstract class BaseWithReferenceRequestBuilder<T, T2 extends BaseWithRefe
      * @param withReferenceRequestClass the class for the request
      * @param referenceRequestBuilderClass the class for the request builder
      */
-    public BaseWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
+    public BaseWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions,
                                             @Nonnull final Class<T2> withReferenceRequestClass,
                                             @Nonnull final Class<T3> referenceRequestBuilderClass) {
         super(requestUrl, client, requestOptions);
@@ -86,7 +84,7 @@ public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
 
     /**
      * Creates a request builder to get the reference to the entity
-     * 
+     *
      * @return the request builder
      */
     @Nullable
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 50ee6eed4..9eceb37b6 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -59,7 +59,7 @@
 /**
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
  */
-public class CoreHttpProvider implements IHttpProvider {
+public class CoreHttpProvider implements IHttpProvider<Request> {
     /**
      * The content type header
      */
diff --git a/src/main/java/com/microsoft/graph/http/CustomRequest.java b/src/main/java/com/microsoft/graph/http/CustomRequest.java
index 31be6256c..594f4bba7 100644
--- a/src/main/java/com/microsoft/graph/http/CustomRequest.java
+++ b/src/main/java/com/microsoft/graph/http/CustomRequest.java
@@ -47,7 +47,7 @@ public class CustomRequest<T> extends BaseRequest<T> {
      * @param requestOptions the options to apply to the request
      * @param responseClass the class for response deserialization
      */
-	public CustomRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends Option> requestOptions, @Nonnull final Class<T> responseClass) {
+	public CustomRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends Option> requestOptions, @Nonnull final Class<T> responseClass) {
 		super(requestUrl, client, requestOptions, responseClass);
     }
 
@@ -60,7 +60,7 @@ public CustomRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClien
      * @return the request to execute against the service
      */
     @Nonnull
-    public static CustomRequest<JsonObject> create(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends Option> requestOptions) {
+    public static CustomRequest<JsonObject> create(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends Option> requestOptions) {
         return new CustomRequest<JsonObject>(requestUrl, client, requestOptions, JsonObject.class);
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java b/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
index d7ae1a1c4..ed3fdacb7 100644
--- a/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.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
@@ -36,7 +36,7 @@ public class GraphFatalServiceException extends GraphServiceException {
 
     /**
      * Create a fatal Graph service exception
-     * 
+     *
      * @param method          the method that caused the exception
      * @param url             the URL
      * @param requestHeaders  the request headers
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index 77a363c39..d5b6516dc 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -342,7 +342,7 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
         for (final HeaderOption option : request.getHeaders()) {
             requestHeaders.add(option.getName() + " : " + option.getValue());
         }
-        boolean isVerbose = logger.getLoggingLevel() == LoggerLevel.DEBUG;
+        final boolean isVerbose = logger.getLoggingLevel() == LoggerLevel.DEBUG;
         final String requestBody;
         if (serializable instanceof byte[]) {
             final byte[] bytes = (byte[]) serializable;
diff --git a/src/main/java/com/microsoft/graph/http/IHttpProvider.java b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
index 00d0abe27..9907d97e6 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
@@ -24,19 +24,16 @@
 
 import javax.annotation.Nullable;
 
-import java.util.concurrent.ExecutorService;
-
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.serializer.ISerializer;
 
-import okhttp3.Request;
-
 /**
  * Sends HTTP requests
+ * @param <NativeRequestType> type of a request for the native http client
  */
-public interface IHttpProvider {
+public interface IHttpProvider<NativeRequestType> {
 
     /**
      * Get the serializer for this HTTP provider
@@ -130,7 +127,7 @@ <Result, BodyType, DeserializeType> Result send(@Nonnull final IHttpRequest requ
 	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
 	 */
     @Nullable
-    <Result, BodyType> Request getHttpRequest(@Nonnull final IHttpRequest request,
+    <Result, BodyType> NativeRequestType getHttpRequest(@Nonnull final IHttpRequest request,
                                               @Nonnull final Class<Result> resultClass,
                                               @Nullable final BodyType serializable)
             throws ClientException;
diff --git a/src/main/java/com/microsoft/graph/http/IHttpRequest.java b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
index 0885b32a5..dfd4e148c 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpRequest.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpRequest.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
@@ -28,8 +28,6 @@
 import com.microsoft.graph.options.HeaderOption;
 import com.microsoft.graph.options.Option;
 
-import okhttp3.Request;
-
 import java.net.URL;
 import java.util.List;
 
@@ -43,7 +41,7 @@ public interface IHttpRequest {
 
     /**
      * Gets the request URL
-     * 
+     *
      * @return the request URL
      */
     @Nullable
@@ -51,7 +49,7 @@ public interface IHttpRequest {
 
     /**
      * Gets the HTTP method
-     * 
+     *
      * @return the HTTP method
      */
     @Nullable
@@ -59,7 +57,7 @@ public interface IHttpRequest {
 
     /**
      * Gets the headers
-     * 
+     *
      * @return the headers
      */
     @Nullable
@@ -67,7 +65,7 @@ public interface IHttpRequest {
 
     /**
      * Gets the options
-     * 
+     *
      * @return the options
      */
     @Nullable
@@ -75,7 +73,7 @@ public interface IHttpRequest {
 
     /**
      * Adds a header to this request
-     * 
+     *
      * @param header the name of the header
      * @param value  the value of the header
      */
@@ -83,86 +81,86 @@ public interface IHttpRequest {
 
     /**
      * Sets useCaches parameter to cache the response
-     * 
+     *
      * @param useCaches the value of useCaches
      */
     void setUseCaches(boolean useCaches);
 
     /**
      * Gets useCaches parameter
-     * 
+     *
      * @return the value of useCaches
      */
     boolean getUseCaches();
-    
+
     /**
      * Sets the max redirects
-     * 
+     *
      * @param maxRedirects Max redirects that a request can take
      */
     void setMaxRedirects(int maxRedirects);
-    
+
     /**
      * Gets the max redirects
-     * 
+     *
      * @return Max redirects that a request can take
      */
     int getMaxRedirects();
-    
+
     /**
      * Sets the should redirect callback
-     * 
+     *
      * @param shouldRedirect Callback called before doing a redirect
      */
     void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect);
-    
+
     /**
      * Gets the should redirect callback
-     * 
+     *
      * @return Callback which is called before redirect
      */
     @Nullable
     IShouldRedirect getShouldRedirect();
-    
+
     /**
      * Sets the should retry callback
-     * 
+     *
      * @param shouldretry The callback called before retry
      */
     void setShouldRetry(@Nonnull IShouldRetry shouldretry);
-    
+
     /**
      * Gets the should retry callback
-     * 
+     *
      * @return Callback called before retry
      */
     @Nullable
     IShouldRetry getShouldRetry();
-    
+
     /**
      * Sets the max retries
-     * 
+     *
      * @param maxRetries Max retries for a request
      */
     void setMaxRetries(int maxRetries);
-    
+
     /**
-     * Gets max retries 
-     * 
+     * Gets max retries
+     *
      * @return Max retries for a request
      */
     int getMaxRetries();
-    
+
     /**
      * Sets the delay in seconds between retires
-     * 
+     *
      * @param delay Delay in seconds between retries
      */
     void setDelay(long delay);
-    
+
     /**
      * Gets delay between retries
-     * 
+     *
      * @return Delay between retries in seconds
      */
     long getDelay();
@@ -175,22 +173,26 @@ public interface IHttpRequest {
      */
     @Nullable
     IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod);
-    
+
     /**
      * Returns the Request object to be executed
+     * @param <NativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Nullable
-    Request getHttpRequest() throws ClientException;
+    default <NativeRequestType> NativeRequestType getHttpRequest() throws ClientException {
+        return getHttpRequest(null); //TODO do something for the nonnull annotation
+    }
 
     /**
      * Returns the Request object to be executed
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
+     * @param <NativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Nullable
-    <requestBodyType, responseType> Request getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException;
+    <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException;
 }
 
diff --git a/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java b/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java
index cdb6582e3..77b8d6065 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpStreamRequest.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
diff --git a/src/main/java/com/microsoft/graph/http/IRequestBuilder.java b/src/main/java/com/microsoft/graph/http/IRequestBuilder.java
index a32742cbf..896aa0d75 100644
--- a/src/main/java/com/microsoft/graph/http/IRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/IRequestBuilder.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
@@ -35,15 +35,15 @@ public interface IRequestBuilder {
 
     /**
      * Gets the client for this request builder
-     * 
+     *
      * @return the client for this request builder
      */
     @Nullable
-    IBaseClient getClient();
+    IBaseClient<?> getClient();
 
     /**
      * Gets the request URL
-     * 
+     *
      * @return the request URL
      */
     @Nullable
@@ -51,7 +51,7 @@ public interface IRequestBuilder {
 
     /**
      * Gets the request URL with an additional segment
-     * 
+     *
      * @param urlSegment the segment to add to the URL
      * @return           the new request URL
      */
diff --git a/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java b/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
index b50ffc1a5..6754c4f98 100644
--- a/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
+++ b/src/main/java/com/microsoft/graph/http/PrimitiveRequest.java
@@ -22,13 +22,10 @@
 
 package com.microsoft.graph.http;
 
-import com.microsoft.graph.http.IRequestBuilder;
 import com.microsoft.graph.core.ClientException;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.BaseRequest;
-import com.microsoft.graph.http.HttpMethod;
 
 /**
  * The class for the Primitive Request.
@@ -44,7 +41,7 @@ public class PrimitiveRequest<T> extends BaseRequest<T> {
      * @param requestOptions the options for this request
      * @param primitiveTypeClass the return type class for the request
      */
-    public PrimitiveRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
+    public PrimitiveRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
         super(requestUrl, client, requestOptions, primitiveTypeClass);
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java b/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
index a82d79fc6..8260c8744 100644
--- a/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
@@ -22,14 +22,9 @@
 
 package com.microsoft.graph.http;
 
-import com.microsoft.graph.http.IRequestBuilder;
-import com.microsoft.graph.core.ClientException;
-import java.util.Arrays;
-import java.util.EnumSet;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 import com.microsoft.graph.core.IBaseClient;
-import com.microsoft.graph.http.BaseRequestBuilder;
 
 /**
  * The class for the Primitive Request Builder.
@@ -46,7 +41,7 @@ public class PrimitiveRequestBuilder<T> extends BaseRequestBuilder<T> {
      * @param requestOptions the options for this request
      * @param primitiveTypeClass the return type class for the request
      */
-    public PrimitiveRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
+    public PrimitiveRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
         super(requestUrl, client, requestOptions);
         this._returnTypeClass = primitiveTypeClass;
     }
@@ -70,6 +65,6 @@ public PrimitiveRequest<T> buildRequest(@Nullable final com.microsoft.graph.opti
      */
     @Nonnull
     public PrimitiveRequest<T> buildRequest(@Nonnull final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions) {
-        return new PrimitiveRequest<T>(getRequestUrl(), getClient(), requestOptions, this._returnTypeClass);
+        return new PrimitiveRequest<>(getRequestUrl(), getClient(), requestOptions, this._returnTypeClass);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index 8c73cb686..6431aa676 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -24,6 +24,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Nullable;
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index a6733a565..a3fbfb52b 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -1,13 +1,9 @@
 package com.microsoft.graph.core;
 
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -35,14 +31,14 @@
  */
 public class BaseClientTests {
 	public static final String DEFAULT_GRAPH_ENDPOINT = "https://graph.microsoft.com/v1.0";
-    private BaseClient baseClient;
-    private IHttpProvider mHttpProvider;
+    private BaseClient<Request> baseClient;
+    private IHttpProvider<Request> mHttpProvider;
     private ILogger mLogger;
     private ISerializer mSerializer;
 
 	@BeforeEach
 	public void setUp() throws Exception {
-        baseClient = new BaseClient();
+        baseClient = new BaseClient<>();
         mLogger = mock(ILogger.class);
         mSerializer = mock(ISerializer.class);
         mHttpProvider = new CoreHttpProvider(mSerializer,
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index ee1c96772..c9a018374 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -35,7 +35,7 @@ private IAuthenticationProvider getAuthProvider() {
     @Test
     public void testClientMethodsReturnStuff() {
         ILogger logger = createLogger();
-        IBaseClient client = BaseClient.builder()
+        IBaseClient<?> client = BaseClient.builder()
                 .logger(logger)
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
@@ -47,7 +47,7 @@ public void testClientMethodsReturnStuff() {
     @Test
     public void testOverrideOfDefaultLogger() {
         ILogger logger = createLogger();
-        IBaseClient client = BaseClient.builder()
+        IBaseClient<?> client = BaseClient.builder()
                 .logger(logger)
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
@@ -61,7 +61,7 @@ public void testOverrideOfDefaultLogger() {
 
     @Test
     public void testOverrideOfDefaultAuthenticationProvider() {
-        IBaseClient client = BaseClient.builder()
+        IBaseClient<?> client = BaseClient.builder()
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
         assertNotNull(client.getHttpProvider());
@@ -98,7 +98,7 @@ public <T> T deserializeObject(JsonElement jsonElement, Class<T> clazz,
                 return null;
             }
         };
-        IBaseClient client = BaseClient.builder()
+        final IBaseClient<?> client = BaseClient.builder()
                 .serializer(serializer)
                 .authenticationProvider(getAuthProvider())
                 .buildClient();
@@ -110,7 +110,7 @@ public <T> T deserializeObject(JsonElement jsonElement, Class<T> clazz,
 
     @Test
     public void testOverrideOfHttpSerializer() {
-        IHttpProvider hp = new IHttpProvider() {
+        IHttpProvider<Request> hp = new IHttpProvider<Request>() {
 
             @Override
             public ISerializer getSerializer() {
@@ -147,7 +147,7 @@ public <Result, BodyType> Request getHttpRequest(IHttpRequest request, Class<Res
 				return null;
             }
         };
-        IBaseClient client = BaseClient
+        final IBaseClient<?> client = BaseClient
                 .builder()
                 .httpProvider(hp)
                 .buildClient();
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
index f1236fa40..91693e427 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
@@ -11,6 +11,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import okhttp3.Request;
+
 import com.google.gson.JsonObject;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.serializer.ISerializer;
@@ -26,14 +28,15 @@ public class BaseCollectionPageTests {
     private String requestUrl = "https://a.b.c/";
 
     @BeforeEach
+    @SuppressWarnings("unchecked")
     public void setUp() throws Exception {
         list = new ArrayList<String>();
         list.add("Object1");
         list.add("Object2");
         list.add("Object3");
-        IBaseClient mBaseClient = mock(IBaseClient.class);
-        mRequestBuilder = new BaseRequestBuilder<String>(requestUrl, mBaseClient, null) {};
-        baseCollectionPage = new BaseCollectionPage<String, BaseRequestBuilder<String>>(list, mRequestBuilder) {};
+        final IBaseClient<Request> mBaseClient = mock(IBaseClient.class);
+        mRequestBuilder = new BaseRequestBuilder<>(requestUrl, mBaseClient, null) {};
+        baseCollectionPage = new BaseCollectionPage<>(list, mRequestBuilder) {};
     }
 
     @Test
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
index 3b630a7dc..7f01e21b4 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -36,7 +36,7 @@
  */
 public class BaseCollectionRequestTests {
 
-    private IBaseClient mBaseClient;
+    private IBaseClient<Request> mBaseClient;
     @SuppressWarnings("unchecked")
     private Class<ICollectionResponse<JsonObject>> jsonObjectCollectionResponseMockClass = (Class<ICollectionResponse<JsonObject>>)mock(ICollectionResponse.class).getClass();
     @SuppressWarnings("unchecked")
@@ -56,6 +56,7 @@ public class BaseCollectionRequestTests {
     private BaseEntityCollectionRequest<JsonObject, ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>> mRequest;
 
     @BeforeEach
+    @SuppressWarnings("unchecked")
     public void setUp() throws Exception {
         mBaseClient = mock(IBaseClient.class);
         final Response response = new Response.Builder()
@@ -71,7 +72,6 @@ public void setUp() throws Exception {
         final OkHttpClient mockClient = BaseStreamRequestTests.getMockClient(response);
         final JsonObject resultobj = new JsonObject();
         resultobj.add("id", new JsonPrimitive("zzz"));
-        @SuppressWarnings("unchecked")
         final ICollectionResponse<JsonObject> result = mock(ICollectionResponse.class);
         when(result.values()).thenReturn(new ArrayList<>(Arrays.asList(resultobj)));
         final ISerializer mSerializer = mock(ISerializer.class);
@@ -81,7 +81,7 @@ public void setUp() throws Exception {
                 mock(ILogger.class),
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
-        mRequest = new BaseEntityCollectionRequest<JsonObject,ICollectionResponse<JsonObject>, BaseCollectionPage<JsonObject, BaseRequestBuilder<JsonObject>>>("https://a.b.c/", mBaseClient, null, jsonObjectCollectionResponseMockClass, jsonObjectCollectionPageMockClass, jsonObjectCollectionRequestBuilderMockClass){};
+        mRequest = new BaseEntityCollectionRequest<>("https://a.b.c/", mBaseClient, null, jsonObjectCollectionResponseMockClass, jsonObjectCollectionPageMockClass, jsonObjectCollectionRequestBuilderMockClass){};
     }
 
     @Test
@@ -118,7 +118,7 @@ public void testPost() {
     public void testFunctionParameters() {
         final Option f1 = new FunctionOption("1", "one");
         final Option f2 = new FunctionOption("2", null);
-        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
         assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
         assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
@@ -129,7 +129,7 @@ public void testFunctionParameters() {
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
@@ -142,7 +142,7 @@ public void testFunctionAndQueryParameters() {
         final Option f2 = new FunctionOption("f2", null);
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
         assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         assertEquals(4, request.getOptions().size());
     }
@@ -164,7 +164,7 @@ public void testPostMethod() {
     public void testHeader() {
         final String expectedHeader = "header key";
         final String expectedValue = "header value";
-        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>>("https://a.b.c/", mock(IBaseClient.class), null, stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
+        final BaseCollectionRequest<String,ICollectionResponse<String>, BaseCollectionPage<String, BaseRequestBuilder<String>>> request = new BaseCollectionRequest<>("https://a.b.c/", mock(IBaseClient.class), null, stringCollectionResponseMockClass, stringCollectionPageMockClass, stringCollectionRequestBuilderMockClass){};
         assertEquals(0, request.getHeaders().size());
         request.addHeader(expectedHeader,expectedValue);
         assertEquals(1,request.getHeaders().size());
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
index 56e00b081..ea1ff68bf 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
@@ -6,6 +6,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import okhttp3.Request;
+
 /**
  * Test cases for {@see BaseRequestBuilder}
  */
@@ -16,7 +18,7 @@ public class BaseRequestBuilderTests {
 
     @BeforeEach
     public void setUp() throws Exception {
-        baseRequestBuilder = new BaseRequestBuilder<String>(expectedRequestUrl,null,null){};
+        baseRequestBuilder = new BaseRequestBuilder<>(expectedRequestUrl,null,null){};
     }
 
     @Test
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index 535986be7..77cdb1c31 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -7,17 +7,13 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.mockito.Mockito.mock;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
@@ -27,7 +23,6 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.options.FunctionOption;
 import com.microsoft.graph.options.Option;
@@ -38,9 +33,8 @@
  * Test cases for {@see BaseRequest}
  */
 public class BaseRequestTests {
-    private IBaseClient mBaseClient;
+    private IBaseClient<Request> mBaseClient;
     private BaseRequest<JsonObject> mRequest;
-    private JsonObject callbackJsonObject;
 
     @BeforeEach
     public void setUp() throws Exception {
@@ -79,6 +73,7 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testFunctionParameters() {
         final Option fo1 = new FunctionOption("1", "one");
         final Option fo2 = new FunctionOption("2", null);
@@ -90,6 +85,7 @@ public void testFunctionParameters() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
@@ -101,6 +97,7 @@ public void testQueryParameters() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testFunctionAndQueryParameters() {
         final Option f1 = new FunctionOption("f1", "fun1");
         final Option f2 = new FunctionOption("f2", null);
@@ -112,6 +109,7 @@ public void testFunctionAndQueryParameters() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testHttpMethod() {
         final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
         assertNull(request.getHttpMethod());
@@ -120,6 +118,7 @@ public void testHttpMethod() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testHeader() {
         final String expectedHeader = "header key";
         final String expectedValue = "header value";
@@ -130,6 +129,7 @@ public void testHeader() {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void testProtectedProperties() {
         assertEquals(0, mRequest.functionOptions.size());
         assertEquals(0, mRequest.queryOptions.size());
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
index 68c0a2329..426b8763c 100644
--- a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -59,7 +59,7 @@ public void testSend() throws IOException {
                 mock(ILogger.class),
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
-        final BaseStreamRequest<String> request = new BaseStreamRequest<String>("https://a.b.c/", mBaseClient,null, null){};
+        final BaseStreamRequest<String> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, null){};
         request.send();
     }
 
@@ -80,7 +80,7 @@ public void testSendWithCallback() throws IOException, InterruptedException, Exe
                 mock(ILogger.class),
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         final java.util.concurrent.CompletableFuture<InputStream> result = request.sendAsync();
         assertNotNull(result.get());
         assertTrue(result.isDone());
@@ -104,7 +104,7 @@ public void testSendWithContentAndCallback() throws IOException, InterruptedExce
                 mock(ILogger.class),
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         final java.util.concurrent.CompletableFuture<InputStream> result = request.sendAsync(new byte[]{1, 2, 3, 4});
         assertNotNull(result.get());
         assertTrue(result.isDone());
@@ -129,13 +129,13 @@ public void testSendWithContent() throws IOException {
                 mock(ILogger.class),
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         request.send(new byte[]{1, 2, 3, 4});
     }
 
     @Test
     public void testBaseMethod() {
-        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<InputStream>("https://a.b.c/", mBaseClient,null, InputStream.class){};
+        final BaseStreamRequest<InputStream> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, InputStream.class){};
         assertEquals("https://a.b.c/", request.getRequestUrl().toString());
         request.addHeader("header key", "header value");
         assertEquals(1,request.getHeaders().size());
diff --git a/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
index e32829b47..555b575d8 100644
--- a/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
+++ b/src/test/java/com/microsoft/graph/http/DeltaCollectionPageTests.java
@@ -7,6 +7,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import okhttp3.Request;
+
 public class DeltaCollectionPageTests {
     @SuppressWarnings("unchecked")
     @Test

From 5e7d1ca9e8ffdbaf91f4581a5f1492ee6196985e Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 28 Jan 2021 15:41:52 -0500
Subject: [PATCH 173/213] - linting

---
 .../microsoft/graph/http/BaseDeltaCollectionRequest.java    | 3 ---
 .../java/com/microsoft/graph/http/BaseRequestTests.java     | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
index 25887dd2a..0d959e300 100644
--- a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
@@ -22,9 +22,6 @@
 
 package com.microsoft.graph.http;
 
-import java.net.URL;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index 77cdb1c31..8cf23da47 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -73,7 +73,6 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testFunctionParameters() {
         final Option fo1 = new FunctionOption("1", "one");
         final Option fo2 = new FunctionOption("2", null);
@@ -85,7 +84,6 @@ public void testFunctionParameters() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
@@ -97,7 +95,6 @@ public void testQueryParameters() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testFunctionAndQueryParameters() {
         final Option f1 = new FunctionOption("f1", "fun1");
         final Option f2 = new FunctionOption("f2", null);
@@ -109,7 +106,6 @@ public void testFunctionAndQueryParameters() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testHttpMethod() {
         final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
         assertNull(request.getHttpMethod());
@@ -118,7 +114,6 @@ public void testHttpMethod() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testHeader() {
         final String expectedHeader = "header key";
         final String expectedValue = "header value";
@@ -129,7 +124,6 @@ public void testHeader() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void testProtectedProperties() {
         assertEquals(0, mRequest.functionOptions.size());
         assertEquals(0, mRequest.queryOptions.size());

From 0384c1bc827624f26216277123611ffaa0551cff Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 1 Feb 2021 10:03:37 -0500
Subject: [PATCH 174/213] - adds missing javadoc comments

---
 src/main/java/com/microsoft/graph/core/BaseClient.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 0afed810d..28b27ea67 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -128,6 +128,8 @@ public static Builder<OkHttpClient, Request> builder() {
 	 *
      * @param <nativeClient> the type of the native http client
      * @param <nativeRequest> the type of the native http request
+     * @param nativeClientClass the class of the native http client
+     * @param nativeRequestClass the class of the native http request
 	 * @return builder to start configuring the client
 	 */
 	@Nonnull

From a1b7d30589248f5067049ece7b8803fc64350642 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 5 Feb 2021 15:07:31 -0500
Subject: [PATCH 175/213] - adds missing nullability annotations

---
 src/main/java/com/microsoft/graph/core/BaseClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 28b27ea67..31593b31c 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -133,7 +133,7 @@ public static Builder<OkHttpClient, Request> builder() {
 	 * @return builder to start configuring the client
 	 */
 	@Nonnull
-	public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(Class<nativeClient> nativeClientClass, Class<nativeRequest> nativeRequestClass) {
+	public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest> builder(@Nonnull final Class<nativeClient> nativeClientClass, @Nonnull final Class<nativeRequest> nativeRequestClass) {
 		return new Builder<>();
 	}
 

From 557603bb08c3f35186574a39ef2b7bf16cf21fd6 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 8 Feb 2021 08:52:49 -0500
Subject: [PATCH 176/213] Apply suggestions from code review

Co-authored-by: Mustafa Zengin <muzengin@microsoft.com>
---
 .../graph/content/BatchRequestContentTest.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
index 4c970fa9f..c857eb6b2 100644
--- a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
@@ -56,7 +56,7 @@ public void testBatchRequestContentCreation() throws MalformedURLException {
             when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
             requestContent.addBatchRequestStep(requestStep);
         }
-        assertTrue(requestContent.requests != null);
+        assertNotNull(requestContent.requests);
     }
 
     @Test
@@ -177,17 +177,17 @@ public void usesHttpMethodFromRequestIfAlreadySet() throws MalformedURLException
         when(requestStep.getHttpMethod()).thenReturn(HttpMethod.DELETE);
         final BatchRequestContent batchRequest = new BatchRequestContent();
         final String stepId = batchRequest.addBatchRequestStep(requestStep);
-        assertEquals("DELETE", batchRequest.getStepById(stepId).method);
+        assertEquals(HttpMethod.DELETE.toString(), batchRequest.getStepById(stepId).method);
     }
 
     @Test
-    public void doesntThrowWhenTryingToRemoveRequestFromNull() {
+    public void doesNotThrowWhenTryingToRemoveRequestFromNull() {
         final BatchRequestContent batchRequest = new BatchRequestContent();
         batchRequest.removeBatchRequestStepWithId("id");
     }
 
     @Test
-    public void doesntRemoveDependsOnWhenNotEmpty() throws MalformedURLException {
+    public void doesNotRemoveDependsOnWhenNotEmpty() throws MalformedURLException {
         IHttpRequest requestStep = mock(IHttpRequest.class);
         when(requestStep.getRequestUrl()).thenReturn(new URL(testurl));
         final BatchRequestContent batchRequest = new BatchRequestContent();
@@ -236,10 +236,10 @@ public AdditionalDataManager additionalDataManager() {
         assertNotNull(step3.headers);
         assertNull(step3.headers.get("content-type"));
 
-        when(requestStep.getHeaders()).thenReturn(Arrays.asList(new HeaderOption("Content-type", "application/octect-stream")));
+        when(requestStep.getHeaders()).thenReturn(Arrays.asList(new HeaderOption("Content-type", "application/octet-stream")));
         final String stepId4 = batchRequest.addBatchRequestStep(requestStep, HttpMethod.POST, Integer.valueOf(10));
         final BatchRequestStep<?> step4 = batchRequest.getStepById(stepId4);
         assertNotNull(step4.headers);
-        assertEquals("application/octect-stream", step4.headers.get("content-type"));
+        assertEquals("application/octet-stream", step4.headers.get("content-type"));
     }
 }

From 5b1a6db9d574ed965affcdbf8150590efa1c6448 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 8 Feb 2021 12:57:48 -0500
Subject: [PATCH 177/213] - fixes an issue where the SDK would be expecting the
 wrong casing for the gaph error codes

---
 .../com/microsoft/graph/http/GraphError.java  | 22 ++++++++++++++-----
 .../microsoft/graph/http/GraphErrorTests.java |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/GraphError.java b/src/main/java/com/microsoft/graph/http/GraphError.java
index a436a915c..a4cba2355 100644
--- a/src/main/java/com/microsoft/graph/http/GraphError.java
+++ b/src/main/java/com/microsoft/graph/http/GraphError.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
@@ -25,6 +25,7 @@
 import com.google.gson.annotations.SerializedName;
 
 import com.microsoft.graph.core.GraphErrorCodes;
+import com.google.common.base.CaseFormat;
 import com.google.gson.annotations.Expose;
 
 import javax.annotation.Nullable;
@@ -54,21 +55,30 @@ public class GraphError {
 
     /**
      * Determine if the given error code is the one that is expected
-     * 
+     *
      * @param expectedCode the expected error code
      * @return <b>true</b> if the error code matches, and <b>false</b> if there was no match
      */
     public boolean isError(@Nonnull final GraphErrorCodes expectedCode) {
-        if (code.equalsIgnoreCase(expectedCode.toString())) {
+        if (transformErrorCodeCase(code).equalsIgnoreCase(expectedCode.toString())) {
             return true;
         }
         GraphInnerError innerError = innererror;
         while (null != innerError) {
-            if (innerError.code.equalsIgnoreCase(expectedCode.toString())) {
+            if (transformErrorCodeCase(innerError.code).equalsIgnoreCase(expectedCode.toString())) {
                 return true;
             }
             innerError = innerError.innererror;
         }
         return false;
     }
+    /**
+     * Transforms the text error code into the format expected by the value of the enum
+     * @param original original lowser Camel cased error code
+     * @return the resulting upper undescore cased error code
+     */
+    @Nonnull
+    protected String transformErrorCodeCase(@Nonnull final String original) {
+        return CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, original);
+    }
 }
diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
index bde72f3ff..8d5998a51 100644
--- a/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphErrorTests.java
@@ -15,7 +15,7 @@ public class GraphErrorTests {
 	public void testIsError(){
         String expectedMessage = "test error message";
         GraphError error = new GraphError();
-        error.code = GraphErrorCodes.ACCESS_DENIED.toString();
+        error.code = "accessDenied"; // the code prop is lower camel cased https://docs.microsoft.com/en-us/graph/errors#code-property
         error.message = expectedMessage;
         assertTrue(error.isError(GraphErrorCodes.ACCESS_DENIED));
         assertEquals(expectedMessage, error.message);

From 1ce365deec7bc0163467c7073507184129937457 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 8 Feb 2021 14:30:50 -0500
Subject: [PATCH 178/213] - fixes a bug where the binrary stream would be
 disposed before clients can read it

---
 .../graph/http/CoreHttpProvider.java          | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 50ee6eed4..257d416e4 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -389,88 +389,88 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                                                                     final Class<Result> resultClass,
                                                                     final Body serializable,
                                                                     final IStatefulResponseHandler<Result, DeserializeType> handler) {
-        try(final ResponseBody body = response.body()) {
+        final ResponseBody body = response.body();
+        try {
+            InputStream in = null;
+            boolean isBinaryStreamInput = false;
             try {
-                InputStream in = null;
-                boolean isBinaryStreamInput = false;
-                try {
 
-                    // Call being executed
+                // Call being executed
 
 
-                    if (handler != null) {
-                        handler.configConnection(response);
-                    }
+                if (handler != null) {
+                    handler.configConnection(response);
+                }
 
-                    logger.logDebug(String.format(Locale.ROOT, "Response code %d, %s",
-                            response.code(),
-                            response.message()));
+                logger.logDebug(String.format(Locale.ROOT, "Response code %d, %s",
+                        response.code(),
+                        response.message()));
 
-                    if (handler != null) {
-                        logger.logDebug("StatefulResponse is handling the HTTP response.");
-                        return handler.generateResult(
-                                request, response, this.serializer, this.logger);
-                    }
+                if (handler != null) {
+                    logger.logDebug("StatefulResponse is handling the HTTP response.");
+                    return handler.generateResult(
+                            request, response, this.serializer, this.logger);
+                }
 
-                    if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
-                        logger.logDebug("Handling error response");
-                        in = body.byteStream();
-                        handleErrorResponse(request, serializable, response);
-                    }
+                if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+                    logger.logDebug("Handling error response");
+                    in = body.byteStream();
+                    handleErrorResponse(request, serializable, response);
+                }
 
-                    final Map<String, List<String>> responseHeaders = response.headers().toMultimap();
+                final Map<String, List<String>> responseHeaders = response.headers().toMultimap();
 
-                    if (response.code() == HttpResponseCode.HTTP_NOBODY
-                            || response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
-                        logger.logDebug("Handling response with no body");
-                        return handleEmptyResponse(responseHeaders, resultClass);
-                    }
+                if (response.code() == HttpResponseCode.HTTP_NOBODY
+                        || response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
+                    logger.logDebug("Handling response with no body");
+                    return handleEmptyResponse(responseHeaders, resultClass);
+                }
 
-                    if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
-                        logger.logDebug("Handling accepted response");
-                        return handleEmptyResponse(responseHeaders, resultClass);
-                    }
+                if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
+                    logger.logDebug("Handling accepted response");
+                    return handleEmptyResponse(responseHeaders, resultClass);
+                }
 
-                    in = new BufferedInputStream(body.byteStream());
-
-                    if (body == null || body.contentLength() == 0)
-                        return null;
-
-                    if (body.contentType() != null && body.contentType().subtype().contains("json")
-                        && resultClass != InputStream.class) {
-                        logger.logDebug("Response json");
-                        return handleJsonResponse(in, responseHeaders, resultClass);
-                    } else if (resultClass == InputStream.class) {
-                        logger.logDebug("Response binary");
-                        isBinaryStreamInput = true;
-                        return (Result) handleBinaryStream(in);
-                    } else if (body.contentType() != null && resultClass != InputStream.class &&
-                        body.contentType().type().contains("text") &&
-                        body.contentType().subtype().contains("plain")) {
-                        return handleRawResponse(in, resultClass);
-                    } else {
-                        return null;
-                    }
-                } finally {
-                    if (!isBinaryStreamInput) {
-                        try{
-                            if (in != null) in.close();
-                        }catch(IOException e) {
-                            logger.logError(e.getMessage(), e);
-                        }
-                        if (response != null) response.close();
+                in = new BufferedInputStream(body.byteStream());
+
+                if (body == null || body.contentLength() == 0)
+                    return null;
+
+                if (body.contentType() != null && body.contentType().subtype().contains("json")
+                    && resultClass != InputStream.class) {
+                    logger.logDebug("Response json");
+                    return handleJsonResponse(in, responseHeaders, resultClass);
+                } else if (resultClass == InputStream.class) {
+                    logger.logDebug("Response binary");
+                    isBinaryStreamInput = true;
+                    return (Result) handleBinaryStream(in);
+                } else if (body.contentType() != null && resultClass != InputStream.class &&
+                    body.contentType().type().contains("text") &&
+                    body.contentType().subtype().contains("plain")) {
+                    return handleRawResponse(in, resultClass);
+                } else {
+                    return null;
+                }
+            } finally {
+                if (!isBinaryStreamInput) {
+                    try{
+                        if (in != null) in.close();
+                        if (body != null) body.close();
+                    }catch(IOException e) {
+                        logger.logError(e.getMessage(), e);
                     }
+                    if (response != null) response.close();
                 }
-            } catch (final GraphServiceException ex) {
-                final boolean shouldLogVerbosely = logger.getLoggingLevel() == LoggerLevel.DEBUG;
-                logger.logError("Graph service exception " + ex.getMessage(shouldLogVerbosely), ex);
-                throw ex;
-            } catch (final Exception ex) {
-                final ClientException clientException = new ClientException("Error during http request",
-                        ex);
-                logger.logError("Error during http request", clientException);
-                throw clientException;
             }
+        } catch (final GraphServiceException ex) {
+            final boolean shouldLogVerbosely = logger.getLoggingLevel() == LoggerLevel.DEBUG;
+            logger.logError("Graph service exception " + ex.getMessage(shouldLogVerbosely), ex);
+            throw ex;
+        } catch (final Exception ex) {
+            final ClientException clientException = new ClientException("Error during http request",
+                    ex);
+            logger.logError("Error during http request", clientException);
+            throw clientException;
         }
     }
     /**

From 3141c2b3fba03ae3662ea2231ea957f0a827c6a1 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 8 Feb 2021 15:56:01 -0500
Subject: [PATCH 179/213] - fixes a bug where chunk encoding would make the
 redirect handler fail

---
 .../com/microsoft/graph/httpcore/HttpClients.java   |  2 +-
 .../microsoft/graph/httpcore/RedirectHandler.java   | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index 80fc0eab0..4e421170b 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -10,7 +10,6 @@
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
-import okhttp3.Request;
 import okhttp3.OkHttpClient.Builder;
 
 /**
@@ -32,6 +31,7 @@ public static Builder custom() {
         return new OkHttpClient.Builder()
                     .addInterceptor(new TelemetryHandler())
                     .followRedirects(false)
+                    .followSslRedirects(false)
                     .protocols(Arrays.asList(Protocol.HTTP_1_1)); //https://stackoverflow.com/questions/62031298/sockettimeout-on-java-11-but-not-on-java-8
     }
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
index a9c95841b..34b52b2d7 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
@@ -132,15 +132,16 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
 
         while(true) {
             response = chain.proceed(request);
-            boolean shouldRedirect = isRedirected(request, response, requestsCount, redirectOptions)
+            final boolean shouldRedirect = isRedirected(request, response, requestsCount, redirectOptions)
                     && redirectOptions.shouldRedirect().shouldRedirect(response);
             if(!shouldRedirect) break;
 
-            Request followup = getRedirect(request, response);
-            if(followup == null) break;
-            request = followup;
-
-            requestsCount++;
+            final Request followup = getRedirect(request, response);
+            if(followup != null) {
+                response.close();
+                request = followup;
+                requestsCount++;
+            }
         }
         return response;
     }

From 69bf4b70ee1820be59231ee22d6753f15b4d7d0b Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 8 Feb 2021 16:00:55 -0500
Subject: [PATCH 180/213] - fixes a bug where the retry handler could fail on
 chunked encoding responses

---
 .../java/com/microsoft/graph/httpcore/RetryHandler.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index 195bf1d5b..2881ed68f 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -197,8 +197,10 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
         while(retryRequest(response, executionCount, request, retryOption)) {
             request = request.newBuilder().addHeader(RETRY_ATTEMPT_HEADER, String.valueOf(executionCount)).build();
             executionCount++;
-            if(response != null && response.body() != null) {
-                response.body().close();
+            if(response != null) {
+                if(response.body() != null)
+                    response.body().close();
+                response.close();
             }
             response = chain.proceed(request);
         }

From e7d7b2488b22eebf73278a67115324df52c90c8f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 9 Feb 2021 14:30:56 -0500
Subject: [PATCH 181/213] - removes bintray/jcenter from repo in preparation
 for sunset

---
 android/build.gradle      |  1 -
 android/gradle.properties |  1 -
 build.gradle              | 63 ---------------------------------------
 gradle.properties         |  1 -
 readme.md                 |  2 +-
 5 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index ba1f56f6e..c7fc41b55 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -11,7 +11,6 @@ buildscript {
         classpath "com.gradle:gradle-enterprise-gradle-plugin:3.5"
         classpath "com.android.tools.build:gradle:4.0.1"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.36.0"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
     }
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
index 221229e60..942b6ca4f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -29,7 +29,6 @@ mavenMajorVersion    = 2
 mavenMinorVersion    = 3
 mavenPatchVersion    = 1
 mavenArtifactSuffix = 
-nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
 #These values are used to run functional tests
 #If you wish to run the functional tests, edit the gradle.properties
diff --git a/build.gradle b/build.gradle
index 15814804c..5e4db62f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,6 @@ plugins {
     id 'eclipse'
     id 'maven-publish'
     id 'signing'
-    id 'com.jfrog.bintray' version '1.8.5'
     id 'jacoco'
 }
 
@@ -49,9 +48,7 @@ sourceSets {
 
 // In this section you declare where to find the dependencies of your project
 repositories {
-    // Use jcenter for resolving your dependencies.
     // You can declare any Maven/Ivy/file repository here.
-    jcenter()
     mavenCentral()
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } // for jacoco, until 0.8.7 gets released
 }
@@ -166,34 +163,6 @@ publishing {
     			}
             }
         }
-        
-        maven {
-            url = 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
-            name = 'jfrogSnapshot'
-            
-            credentials {
-    			if (project.rootProject.file('local.properties').exists()) {
-        			Properties properties = new Properties()
-        			properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        			username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
-        			password = properties.getProperty('bintray.apikey')
-    			}
-            }
-		}
-
-        maven {
-            url = 'https://oss.jfrog.org/artifactory/libs-release'
-            name = 'jfrog'
-            
-            credentials {
-    			if (project.rootProject.file('local.properties').exists()) {
-        			Properties properties = new Properties()
-        			properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        			username = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
-        			password = properties.getProperty('bintray.apikey')
-    			}
-            }
-		}
     }
 }
 
@@ -209,38 +178,6 @@ def fixAscNames = { name ->
         name.replace('msgraph-sdk-java-core', "${project.property('mavenArtifactId')}-${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}")
     }
 }
-bintray {
-    if (project.rootProject.file('local.properties').exists()) {
-        Properties properties = new Properties()
-        properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        user = (properties.containsKey('bintray.user')) ? properties.getProperty('bintray.user').toLowerCase() : "BINTRAY_USERNAME"
-        key = properties.getProperty('bintray.apikey')
-    }
-	publications = ['mavenCentralRelease']
-    filesSpec {
-        from ('build/libs') {
-            include 'msgraph-sdk-java-core*.jar.asc'
-            rename fixAscNames
-        }
-        from ('build') {
-            include 'generated-pom.xml.asc'
-            rename fixAscNames
-        }
-        into "com/microsoft/graph/${project.property('mavenArtifactId')}/${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}/"
-    }
-	pkg {
-		repo = 'Maven'
-		name = project.property('mavenArtifactId')
-		userOrg = 'microsoftgraph'
-		licenses = ['MIT']
-		vcsUrl = 'https://github.com/microsoftgraph/msgraph-sdk-java-core.git'
-		publicDownloadNumbers = true
-		version {
-			name = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
-			vcsTag = "${mavenMajorVersion}.${mavenMinorVersion}.${mavenPatchVersion}"
-		}
-	}
-}
 
 compileJava {
   sourceCompatibility = 1.8
diff --git a/gradle.properties b/gradle.properties
index 1dfad7c03..817c47716 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -27,7 +27,6 @@ mavenMajorVersion    = 2
 mavenMinorVersion    = 0
 mavenPatchVersion    = 0
 mavenArtifactSuffix = 
-nightliesUrl         = http://dl.bintray.com/MicrosoftGraph/Maven
 
 #These values are used to run functional tests
 #If you wish to run the functional tests, edit the gradle.properties
diff --git a/readme.md b/readme.md
index 0d27e690f..bf926ff21 100644
--- a/readme.md
+++ b/readme.md
@@ -15,7 +15,7 @@ Add the repository and a compile dependency for `microsoft-graph-core` to your p
 
 ```gradle
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {

From 55d8d76f6f54f403ecf45438e2e95e004ef84b8c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 08:34:19 -0500
Subject: [PATCH 182/213] - fixes generic type casing

---
 .../com/microsoft/graph/core/BaseClient.java  | 34 +++++++++----------
 .../com/microsoft/graph/core/IBaseClient.java |  6 ++--
 .../graph/http/BaseCollectionRequest.java     |  4 +--
 .../com/microsoft/graph/http/BaseRequest.java |  6 ++--
 .../graph/http/BaseStreamRequest.java         |  4 +--
 .../microsoft/graph/http/IHttpProvider.java   |  6 ++--
 .../microsoft/graph/http/IHttpRequest.java    |  8 ++---
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 31593b31c..a97f6c030 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -44,9 +44,9 @@
 
 /**
  * A client that communications with an OData service
- * @param <NativeRequestType> type of a request for the native http client
+ * @param <nativeRequestType> type of a request for the native http client
  */
-public class BaseClient<NativeRequestType> implements IBaseClient<NativeRequestType> {
+public class BaseClient<nativeRequestType> implements IBaseClient<nativeRequestType> {
     /**
 	 * Restricted constructor
 	 */
@@ -140,11 +140,11 @@ public static <nativeClient, nativeRequest> Builder<nativeClient, nativeRequest>
 	/**
 	 * Builder to help configure the Graph service client
      * @param <httpClientType> type of the native http library client
-     * @param <NativeRequestType> type of a request for the native http client
+     * @param <nativeRequestType> type of a request for the native http client
 	 */
-	public static class Builder<httpClientType, NativeRequestType> {
+	public static class Builder<httpClientType, nativeRequestType> {
 		private ISerializer serializer;
-		private IHttpProvider<NativeRequestType> httpProvider;
+		private IHttpProvider<nativeRequestType> httpProvider;
 		private ILogger logger;
 		private httpClientType httpClient;
 		private IAuthenticationProvider auth;
@@ -179,9 +179,9 @@ private httpClientType getHttpClient() {
 			}
         }
         @SuppressWarnings("unchecked")
-		private IHttpProvider<NativeRequestType> getHttpProvider() {
+		private IHttpProvider<nativeRequestType> getHttpProvider() {
 			if(httpProvider == null) {
-				return (IHttpProvider<NativeRequestType>)new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
+				return (IHttpProvider<nativeRequestType>)new CoreHttpProvider(getSerializer(), getLogger(), (OkHttpClient)getHttpClient());
 			} else {
 				return httpProvider;
 			}
@@ -195,7 +195,7 @@ private IHttpProvider<NativeRequestType> getHttpProvider() {
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, NativeRequestType> serializer(@Nonnull final ISerializer serializer) {
+		public Builder<httpClientType, nativeRequestType> serializer(@Nonnull final ISerializer serializer) {
 			checkNotNull(serializer, "serializer");
 			this.serializer = serializer;
 			return this;
@@ -209,7 +209,7 @@ public Builder<httpClientType, NativeRequestType> serializer(@Nonnull final ISer
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, NativeRequestType> httpProvider(@Nonnull final IHttpProvider<NativeRequestType> httpProvider) {
+		public Builder<httpClientType, nativeRequestType> httpProvider(@Nonnull final IHttpProvider<nativeRequestType> httpProvider) {
 			checkNotNull(httpProvider, "httpProvider");
 			this.httpProvider = httpProvider;
 			return this;
@@ -223,7 +223,7 @@ public Builder<httpClientType, NativeRequestType> httpProvider(@Nonnull final IH
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, NativeRequestType> logger(@Nonnull final ILogger logger) {
+		public Builder<httpClientType, nativeRequestType> logger(@Nonnull final ILogger logger) {
 			checkNotNull(logger, "logger");
 			this.logger = logger;
 			return this;
@@ -237,7 +237,7 @@ public Builder<httpClientType, NativeRequestType> logger(@Nonnull final ILogger
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, NativeRequestType> httpClient(@Nonnull final httpClientType client) {
+		public Builder<httpClientType, nativeRequestType> httpClient(@Nonnull final httpClientType client) {
 			checkNotNull(client, "client");
 			this.httpClient = client;
 			return this;
@@ -250,7 +250,7 @@ public Builder<httpClientType, NativeRequestType> httpClient(@Nonnull final http
 		 * @return the instance of this builder
 		 */
 		@Nonnull
-		public Builder<httpClientType, NativeRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
+		public Builder<httpClientType, nativeRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
 			checkNotNull(auth, "auth");
 			this.auth = auth;
 			return this;
@@ -266,7 +266,7 @@ public Builder<httpClientType, NativeRequestType> authenticationProvider(@Nonnul
 		 *			 if there was an exception creating the client
 		 */
 		@Nonnull
-		protected <ClientType extends BaseClient<NativeRequestType>> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
+		protected <ClientType extends BaseClient<nativeRequestType>> ClientType buildClient(@Nonnull ClientType instance) throws ClientException {
             Objects.requireNonNull(instance, "The instance cannot be null");
 			instance.setHttpProvider(this.getHttpProvider());
 			instance.setLogger(this.getLogger());
@@ -282,7 +282,7 @@ protected <ClientType extends BaseClient<NativeRequestType>> ClientType buildCli
 		 *			 if there was an exception creating the client
 		 */
 		@Nonnull
-		public IBaseClient<NativeRequestType> buildClient() throws ClientException {
+		public IBaseClient<nativeRequestType> buildClient() throws ClientException {
 			return buildClient(new BaseClient<>());
 		}
 	}
@@ -302,7 +302,7 @@ protected static void checkNotNull(@Nullable final Object o, @Nonnull final Stri
     /**
      * The HTTP provider instance
      */
-    private IHttpProvider<NativeRequestType> httpProvider;
+    private IHttpProvider<nativeRequestType> httpProvider;
 
     /**
      * The logger
@@ -321,7 +321,7 @@ protected static void checkNotNull(@Nullable final Object o, @Nonnull final Stri
      */
     @Override
     @Nullable
-    public IHttpProvider<NativeRequestType> getHttpProvider() {
+    public IHttpProvider<nativeRequestType> getHttpProvider() {
         return httpProvider;
     }
 
@@ -361,7 +361,7 @@ protected void setLogger(@Nonnull final ILogger logger) {
      *
      * @param httpProvider The HTTP provider
      */
-    protected void setHttpProvider(@Nonnull final IHttpProvider<NativeRequestType> httpProvider) {
+    protected void setHttpProvider(@Nonnull final IHttpProvider<nativeRequestType> httpProvider) {
         checkNotNull(httpProvider, "httpProvider");
         this.httpProvider = httpProvider;
     }
diff --git a/src/main/java/com/microsoft/graph/core/IBaseClient.java b/src/main/java/com/microsoft/graph/core/IBaseClient.java
index d695a3258..c260831a8 100644
--- a/src/main/java/com/microsoft/graph/core/IBaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/IBaseClient.java
@@ -33,9 +33,9 @@
 
 /**
  * A client that communications with an OData service
- * @param <NativeRequestType> type of a request for the native http client
+ * @param <nativeRequestType> type of a request for the native http client
  */
-public interface IBaseClient<NativeRequestType> {
+public interface IBaseClient<nativeRequestType> {
     /**
      * Gets the service root
      *
@@ -57,7 +57,7 @@ public interface IBaseClient<NativeRequestType> {
      * @return the HTTP provider
      */
     @Nullable
-    IHttpProvider<NativeRequestType> getHttpProvider();
+    IHttpProvider<nativeRequestType> getHttpProvider();
 
     /**
      * Gets the logger
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 2710d2a43..5ff5921af 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -422,12 +422,12 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
-     * @param <NativeRequestType> type of a request for the native http client
+     * @param <nativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Override
     @Nullable
-    public <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
         return baseRequest.getHttpRequest(serializedObject);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index 183ab0a5d..a73776532 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -201,14 +201,14 @@ public URL getRequestUrl() {
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
-     * @param <NativeRequestType> type of a request for the native http client
+     * @param <nativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Override
     @Nullable
     @SuppressWarnings("unchecked")
-    public <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
-        return (NativeRequestType)client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject);
+    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+        return (nativeRequestType)client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject);
     }
 
     private String addFunctionParameters() {
diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
index 0918b008d..adb8a7ee9 100644
--- a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -296,12 +296,12 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
-     * @param <NativeRequestType> type of a request for the native http client
+     * @param <nativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Override
     @Nullable
-    public <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
         return baseRequest.getHttpRequest(serializedObject);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/IHttpProvider.java b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
index 9907d97e6..55e4d7b96 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpProvider.java
@@ -31,9 +31,9 @@
 
 /**
  * Sends HTTP requests
- * @param <NativeRequestType> type of a request for the native http client
+ * @param <nativeRequestType> type of a request for the native http client
  */
-public interface IHttpProvider<NativeRequestType> {
+public interface IHttpProvider<nativeRequestType> {
 
     /**
      * Get the serializer for this HTTP provider
@@ -127,7 +127,7 @@ <Result, BodyType, DeserializeType> Result send(@Nonnull final IHttpRequest requ
 	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
 	 */
     @Nullable
-    <Result, BodyType> NativeRequestType getHttpRequest(@Nonnull final IHttpRequest request,
+    <Result, BodyType> nativeRequestType getHttpRequest(@Nonnull final IHttpRequest request,
                                               @Nonnull final Class<Result> resultClass,
                                               @Nullable final BodyType serializable)
             throws ClientException;
diff --git a/src/main/java/com/microsoft/graph/http/IHttpRequest.java b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
index dfd4e148c..76f674e17 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpRequest.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
@@ -176,11 +176,11 @@ public interface IHttpRequest {
 
     /**
      * Returns the Request object to be executed
-     * @param <NativeRequestType> type of a request for the native http client
+     * @param <nativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Nullable
-    default <NativeRequestType> NativeRequestType getHttpRequest() throws ClientException {
+    default <nativeRequestType> nativeRequestType getHttpRequest() throws ClientException {
         return getHttpRequest(null); //TODO do something for the nonnull annotation
     }
 
@@ -189,10 +189,10 @@ default <NativeRequestType> NativeRequestType getHttpRequest() throws ClientExce
      * @param serializedObject the object to serialize at the body of the request
      * @param <requestBodyType> the type of the serialized object
      * @param <responseType> the type of the response
-     * @param <NativeRequestType> type of a request for the native http client
+     * @param <nativeRequestType> type of a request for the native http client
      * @return the Request object to be executed
      */
     @Nullable
-    <requestBodyType, responseType, NativeRequestType> NativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException;
+    <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException;
 }
 

From 07bee6ce0b600cebb518827a369f7f29fe40a441 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 10:08:50 -0500
Subject: [PATCH 183/213] - adds java 15 installation for perf and latest
 language features

---
 .azure-pipelines/buildAndPackage.yml | 11 +++++++++++
 .azure-pipelines/prValidate.yml      | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index 912424330..ae2ad8560 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -41,6 +41,17 @@ steps:
   inputs:
     debugMode: false
 
+- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
+  displayName: 'Download JDK'
+
+- task: JavaToolInstaller@0
+  inputs:
+    versionSpec: '15'
+    jdkArchitectureOption: 'x64'
+    jdkSourceOption: 'LocalDirectory'
+    jdkFile: 'OpenJDK.zip'
+    jdkDestinationDirectory: 'binaries'
+
 - task: DownloadSecureFile@1
   inputs:
     secureFile: 'local.properties'
diff --git a/.azure-pipelines/prValidate.yml b/.azure-pipelines/prValidate.yml
index 10a10ed3e..53d61c7b5 100644
--- a/.azure-pipelines/prValidate.yml
+++ b/.azure-pipelines/prValidate.yml
@@ -43,6 +43,17 @@ steps:
   inputs:
     debugMode: false
 
+- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
+  displayName: 'Download JDK'
+
+- task: JavaToolInstaller@0
+  inputs:
+    versionSpec: '15'
+    jdkArchitectureOption: 'x64'
+    jdkSourceOption: 'LocalDirectory'
+    jdkFile: 'OpenJDK.zip'
+    jdkDestinationDirectory: 'binaries'
+
 - task: Gradle@2
   inputs:
     gradleWrapperFile: 'gradlew'

From c7b27a8400f0be068751b4c7c2b1d97a03858868 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 12:24:52 -0500
Subject: [PATCH 184/213] - adds exception in reflection methods to facilitate
 detection of issues

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java | 2 +-
 .../microsoft/graph/http/BaseCollectionRequestBuilder.java   | 5 +++--
 .../http/BaseCollectionWithReferencesRequestBuilder.java     | 3 ++-
 .../microsoft/graph/http/BaseReferenceRequestBuilder.java    | 3 ++-
 .../graph/http/BaseWithReferenceRequestBuilder.java          | 5 +++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 5ff5921af..d34dd3222 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -126,7 +126,7 @@ public T3 buildFromResponse(@Nonnull final T2 response) {
             final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), builder.getClass()).newInstance(response, response.nextLink() == null ? null : builder);
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
         }
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
index 2428cefc7..f2c0f1b02 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -61,7 +62,7 @@ public T5 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
             return collRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                     .newInstance(getRequestUrl(), getClient(), requestOptions);
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 
@@ -77,7 +78,7 @@ public T2 byId(@Nonnull final String id) {
             return reqBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
index e9005b43c..b6e0fe1df 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -70,7 +71,7 @@ public T8 references() {
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
                     .newInstance(getRequestUrl() + "/$ref", getClient(), getOptions());
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
         }
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
index aea14506c..b5f49f938 100644
--- a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -72,7 +73,7 @@ public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
             return refRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrl(), getClient(), requestOptions);
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
index a87e67a43..5ecddab1a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.http;
 
+import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
@@ -78,7 +79,7 @@ public T2 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
             return wReferenceRequestClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrl(), getClient(), requestOptions);
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 
@@ -93,7 +94,7 @@ public T3 reference(){
             return refRequestBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrl() + "/$ref", getClient(), getOptions());
         } catch (IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
-            return null;
+            throw new ClientException("Could not find the required class", ex);
 		}
     }
 }

From 480b52178878a854cd48adac2fef75cd2fa38b21 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 13:26:15 -0500
Subject: [PATCH 185/213] - avoid instantiating a builder when it's not needed

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index d34dd3222..78d0ed44a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -120,10 +120,10 @@ protected java.util.concurrent.CompletableFuture<T2> sendAsync() throws ClientEx
     public T3 buildFromResponse(@Nonnull final T2 response) {
         final List<com.microsoft.graph.options.Option> options = new java.util.ArrayList<com.microsoft.graph.options.Option>();
         try {
-            final Object builder = this.collRequestBuilderClass
+            final Object builder = response.nextLink() == null ? null : this.collRequestBuilderClass
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
                     .newInstance(response.nextLink(), getBaseRequest().getClient(), options);
-            final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), builder.getClass()).newInstance(response, response.nextLink() == null ? null : builder);
+            final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), this.collRequestBuilderClass).newInstance(response, builder);
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
             throw new ClientException("Could not find the required class", ex);

From 1deae01ce9f0ab6c49b29c90da946222d0daf538 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Feb 2021 14:06:54 -0500
Subject: [PATCH 186/213] - fixes a bug where the max retries would not be set
 for collection requests

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 5ff5921af..7c2ecf67f 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -375,7 +375,7 @@ public IShouldRetry getShouldRetry() {
      * @param maxRetries Max retries for a request
      */
     public void setMaxRetries(int maxRetries) {
-    	baseRequest.setMaxRedirects(maxRetries);
+    	baseRequest.setMaxRetries(maxRetries);
     }
 
     /**

From f973ffa22e1e615f2d9354748f78b4eb63a98d44 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 11 Feb 2021 09:28:20 -0500
Subject: [PATCH 187/213] - moves pipeline steps in templates

---
 .azure-pipelines/buildAndPackage.yml          | 100 ++----------------
 .azure-pipelines/prValidate.yml               |  61 ++---------
 .azure-pipelines/templates/alert-failure.yml  |  10 ++
 .../templates/build-and-coverage.yml          |  16 +++
 .../templates/checkout-and-credscan.yml       |   9 ++
 .azure-pipelines/templates/install-java.yml   |  11 ++
 .../templates/publish-artefacts.yml           |  21 ++++
 .azure-pipelines/templates/secure-files.yml   |  18 ++++
 8 files changed, 101 insertions(+), 145 deletions(-)
 create mode 100644 .azure-pipelines/templates/alert-failure.yml
 create mode 100644 .azure-pipelines/templates/build-and-coverage.yml
 create mode 100644 .azure-pipelines/templates/checkout-and-credscan.yml
 create mode 100644 .azure-pipelines/templates/install-java.yml
 create mode 100644 .azure-pipelines/templates/publish-artefacts.yml
 create mode 100644 .azure-pipelines/templates/secure-files.yml

diff --git a/.azure-pipelines/buildAndPackage.yml b/.azure-pipelines/buildAndPackage.yml
index ae2ad8560..76beadda8 100644
--- a/.azure-pipelines/buildAndPackage.yml
+++ b/.azure-pipelines/buildAndPackage.yml
@@ -14,11 +14,11 @@ trigger:
     include:
       - src/*
     exclude:
+      - .gradle/wrapper
       - .gitignore
       - CONTRIBUTING.md
       - LICENSE
       - THIRD PARTY NOTICES
-      - build.gradle
       - gradle.properties
       - gradlew
       - gradlew.bat
@@ -29,96 +29,12 @@ trigger:
 pr: none
 
 pool:
-  vmImage: 'windows-latest'
+  vmImage: windows-latest
 
 steps:
-- checkout: self
-  clean: true
-  fetchDepth: 1
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-  displayName: 'Run CredScan'
-  inputs:
-    debugMode: false
-
-- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
-  displayName: 'Download JDK'
-
-- task: JavaToolInstaller@0
-  inputs:
-    versionSpec: '15'
-    jdkArchitectureOption: 'x64'
-    jdkSourceOption: 'LocalDirectory'
-    jdkFile: 'OpenJDK.zip'
-    jdkDestinationDirectory: 'binaries'
-
-- task: DownloadSecureFile@1
-  inputs:
-    secureFile: 'local.properties'
-
-- task: DownloadSecureFile@1
-  inputs:
-    secureFile: 'secring.gpg'
-
-- task: DownloadSecureFile@1
-  inputs:
-    secureFile: 'secring.gpg.lock'
-
-- task: CopyFiles@2
-  inputs:
-    SourceFolder: '$(Agent.TempDirectory)'
-    Contents: '**'
-    TargetFolder: '$(System.DefaultWorkingDirectory)'
-
-- task: Gradle@2
-  inputs:
-    gradleWrapperFile: 'gradlew'
-    tasks: 'build'
-    publishJUnitResults: true
-    testResultsFiles: '**/TEST-*.xml'
-    javaHomeOption: 'JDKVersion'
-    sonarQubeRunAnalysis: false
-
-- task: PublishCodeCoverageResults@1
-  inputs:
-    codeCoverageTool: 'JaCoCo'
-    summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
-    pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
-    failIfCoverageEmpty: true
-
-- task: PublishBuildArtifacts@1
-  displayName: 'Publish Artifact: drop'
-  inputs:
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-
-- task: CopyFiles@2
-  inputs:
-    SourceFolder: '$(System.DefaultWorkingDirectory)'
-    Contents: |
-      **/libs/*
-      build/generated-pom.xml
-      build/generated-pom.xml.asc
-      build.gradle
-      gradlew
-      gradlew.bat
-      settings.gradle
-      gradle.properties
-      **/gradle/**
-      Scripts/**
-    TargetFolder: '$(Build.ArtifactStagingDirectory)/'
-
-- task: PublishBuildArtifacts@1
-  inputs:
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-    ArtifactName: 'drop'
-    publishLocation: 'Container'
-
-- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
-  displayName: 'Graph Client Tooling pipeline fail notification'
-  inputs:
-    addressType: serviceEndpoint
-    serviceEndpointName: 'microsoftgraph pipeline status'
-    title: '$(Build.DefinitionName) failure notification'
-    text: 'This pipeline has failed. View the build details for further information. This is a blocking failure.'
-  condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
-  enabled: true
+- template: templates/checkout-and-credscan.yml
+- template: templates/install-java.yml
+- template: templates/secure-files.yml
+- template: templates/build-and-coverage.yml
+- template: templates/publish-artefacts.yml
+- template: templates/alert-failure.yml
diff --git a/.azure-pipelines/prValidate.yml b/.azure-pipelines/prValidate.yml
index 53d61c7b5..4a486e925 100644
--- a/.azure-pipelines/prValidate.yml
+++ b/.azure-pipelines/prValidate.yml
@@ -6,12 +6,12 @@
 pr: 
   branches:
     include:
-      - master
-      - main
       - dev
+      - main
+      - master
+      - feature/v2
   paths:
     exclude:
-      - .azure-pipelines
       - .gradle/wrapper
       - .gitignore
       - CONTRIBUTING.md
@@ -26,56 +26,11 @@ pr:
 
 trigger: none # disable triggers based on commits.
 
-variables:
-  PACKAGE_NAME: 'microsoft-graph-core'
-  PROPERTIES_PATH: '.\gradle.properties'
-
-pool: 
+pool:
   vmImage: windows-latest
 
 steps:
-- checkout: self
-  clean: true
-  fetchDepth: 1
-
-- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
-  displayName: 'Run CredScan'
-  inputs:
-    debugMode: false
-
-- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
-  displayName: 'Download JDK'
-
-- task: JavaToolInstaller@0
-  inputs:
-    versionSpec: '15'
-    jdkArchitectureOption: 'x64'
-    jdkSourceOption: 'LocalDirectory'
-    jdkFile: 'OpenJDK.zip'
-    jdkDestinationDirectory: 'binaries'
-
-- task: Gradle@2
-  inputs:
-    gradleWrapperFile: 'gradlew'
-    tasks: 'build'
-    publishJUnitResults: true
-    testResultsFiles: '**/TEST-*.xml'
-    javaHomeOption: 'JDKVersion'
-    sonarQubeRunAnalysis: false
-
-- task: PublishCodeCoverageResults@1
-  inputs:
-    codeCoverageTool: 'JaCoCo'
-    summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
-    pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
-    failIfCoverageEmpty: true
-
-- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
-  displayName: 'Graph Client Tooling pipeline fail notification'
-  inputs:
-    addressType: serviceEndpoint
-    serviceEndpointName: 'microsoftgraph pipeline status'
-    title: '$(Build.DefinitionName) failure notification'
-    text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
-  condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
-  enabled: true
+- template: templates/checkout-and-credscan.yml
+- template: templates/install-java.yml
+- template: templates/build-and-coverage.yml
+- template: templates/alert-failure.yml
diff --git a/.azure-pipelines/templates/alert-failure.yml b/.azure-pipelines/templates/alert-failure.yml
new file mode 100644
index 000000000..51f2043d0
--- /dev/null
+++ b/.azure-pipelines/templates/alert-failure.yml
@@ -0,0 +1,10 @@
+steps:
+- task: YodLabs.O365PostMessage.O365PostMessageBuild.O365PostMessageBuild@0
+  displayName: 'Graph Client Tooling pipeline fail notification'
+  inputs:
+    addressType: serviceEndpoint
+    serviceEndpointName: 'microsoftgraph pipeline status'
+    title: '$(Build.DefinitionName) failure notification'
+    text: 'This pipeline has failed. View the build details for further information. This is a blocking failure. '
+  condition: and(failed(), ne(variables['Build.Reason'], 'Manual'))
+  enabled: true
\ No newline at end of file
diff --git a/.azure-pipelines/templates/build-and-coverage.yml b/.azure-pipelines/templates/build-and-coverage.yml
new file mode 100644
index 000000000..9a56fac54
--- /dev/null
+++ b/.azure-pipelines/templates/build-and-coverage.yml
@@ -0,0 +1,16 @@
+steps:
+- task: Gradle@2
+  inputs:
+    gradleWrapperFile: 'gradlew'
+    tasks: 'build'
+    publishJUnitResults: true
+    testResultsFiles: '**/TEST-*.xml'
+    javaHomeOption: 'JDKVersion'
+    sonarQubeRunAnalysis: false
+
+- task: PublishCodeCoverageResults@1
+  inputs:
+    codeCoverageTool: 'JaCoCo'
+    summaryFileLocation: $(System.DefaultWorkingDirectory)/build/reports/jacoco/test/jacocoTestReport.xml
+    pathToSources: $(System.DefaultWorkingDirectory)/src/main/java
+    failIfCoverageEmpty: true
\ No newline at end of file
diff --git a/.azure-pipelines/templates/checkout-and-credscan.yml b/.azure-pipelines/templates/checkout-and-credscan.yml
new file mode 100644
index 000000000..cc5c7c2f5
--- /dev/null
+++ b/.azure-pipelines/templates/checkout-and-credscan.yml
@@ -0,0 +1,9 @@
+steps:
+- checkout: self
+  clean: true
+  fetchDepth: 1
+
+- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2
+  displayName: 'Run CredScan'
+  inputs:
+    debugMode: false
\ No newline at end of file
diff --git a/.azure-pipelines/templates/install-java.yml b/.azure-pipelines/templates/install-java.yml
new file mode 100644
index 000000000..d739611a5
--- /dev/null
+++ b/.azure-pipelines/templates/install-java.yml
@@ -0,0 +1,11 @@
+steps:
+- pwsh: 'Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.zip -OutFile OpenJDK.zip'
+  displayName: 'Download JDK'
+
+- task: JavaToolInstaller@0
+  inputs:
+    versionSpec: '15'
+    jdkArchitectureOption: 'x64'
+    jdkSourceOption: 'LocalDirectory'
+    jdkFile: 'OpenJDK.zip'
+    jdkDestinationDirectory: 'binaries'
\ No newline at end of file
diff --git a/.azure-pipelines/templates/publish-artefacts.yml b/.azure-pipelines/templates/publish-artefacts.yml
new file mode 100644
index 000000000..5715208b2
--- /dev/null
+++ b/.azure-pipelines/templates/publish-artefacts.yml
@@ -0,0 +1,21 @@
+steps:
+- task: CopyFiles@2
+  inputs:
+    SourceFolder: '$(System.DefaultWorkingDirectory)'
+    Contents: |
+      **/libs/*
+      build/generated-pom.xml
+      build/generated-pom.xml.asc
+      build.gradle
+      gradlew
+      gradlew.bat
+      settings.gradle
+      gradle.properties
+      **/gradle/**
+      Scripts/**
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/'
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Artifact: drop'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
\ No newline at end of file
diff --git a/.azure-pipelines/templates/secure-files.yml b/.azure-pipelines/templates/secure-files.yml
new file mode 100644
index 000000000..0cdeb85b9
--- /dev/null
+++ b/.azure-pipelines/templates/secure-files.yml
@@ -0,0 +1,18 @@
+steps:
+- task: DownloadSecureFile@1
+  inputs:
+    secureFile: 'local.properties'
+
+- task: DownloadSecureFile@1
+  inputs:
+    secureFile: 'secring.gpg'
+
+- task: DownloadSecureFile@1
+  inputs:
+    secureFile: 'secring.gpg.lock'
+
+- task: CopyFiles@2
+  inputs:
+    SourceFolder: '$(Agent.TempDirectory)'
+    Contents: '**'
+    TargetFolder: '$(System.DefaultWorkingDirectory)'
\ No newline at end of file

From 1acc2b584f0012960cb5289ce8dca3babde87935 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 11 Feb 2021 11:02:07 -0500
Subject: [PATCH 188/213] - upgades dependencies

---
 gradle/dependencies.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index c5effbd93..fc0167fec 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,7 +1,7 @@
 dependencies {
     // Use JUnit test framework
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.1'
     testImplementation 'org.mockito:mockito-inline:3.7.7'
     
     api 'com.squareup.okhttp3:okhttp:4.9.1'
@@ -9,5 +9,5 @@ dependencies {
     implementation 'com.google.guava:guava:30.1-jre'
 
     implementation 'com.google.code.gson:gson:2.8.6'
-    api 'com.azure:azure-identity:1.2.2'
+    api 'com.azure:azure-identity:1.2.3'
 }
\ No newline at end of file

From c34f8fc7b775f0ce3ea795841a3c2ffa4d843468 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 11 Feb 2021 11:02:34 -0500
Subject: [PATCH 189/213] - replaces deprecated method usage

---
 .../com/microsoft/graph/httpcore/ChaosHttpHandler.java   | 2 +-
 .../microsoft/graph/content/BatchRequestContentTest.java | 9 +--------
 .../java/com/microsoft/graph/http/BaseRequestTests.java  | 3 +--
 .../com/microsoft/graph/http/BaseStreamRequestTests.java | 3 ++-
 .../microsoft/graph/httpcore/RedirectHandlerTest.java    | 2 +-
 .../com/microsoft/graph/httpcore/RetryHandlerTest.java   | 4 ++--
 6 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
index 2e32b62c3..37970397a 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
@@ -65,7 +65,7 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
                         .code(MSClientErrorCodeTooManyRequests)
                         .message("Too Many Requests")
                         .addHeader(RETRY_AFTER, retryAfterValue)
-                        .body(ResponseBody.create(MediaType.get("application/json"), responseBody))
+                        .body(ResponseBody.create(responseBody, MediaType.get("application/json")))
                         .build();
         } else {
             return chain.proceed(request);
diff --git a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
index c857eb6b2..e6aa2a98d 100644
--- a/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchRequestContentTest.java
@@ -1,11 +1,9 @@
 package com.microsoft.graph.content;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -14,11 +12,8 @@
 import java.net.URL;
 import java.util.Arrays;
 import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.concurrent.ThreadLocalRandom;
 
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import com.microsoft.graph.core.BaseClient;
 import com.microsoft.graph.core.IBaseClient;
@@ -33,8 +28,6 @@
 import com.microsoft.graph.serializer.ISerializer;
 
 import org.junit.jupiter.api.Test;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -154,7 +147,7 @@ public void executeBatchTest() throws Throwable {
 
         final CoreHttpProvider mHttpProvider = new CoreHttpProvider(new DefaultSerializer(mock(ILogger.class)),
                 mock(ILogger.class), mHttpClient);
-        final IBaseClient mClient = BaseClient.builder().authenticationProvider(mock(IAuthenticationProvider.class))
+        final IBaseClient<?> mClient = BaseClient.builder().authenticationProvider(mock(IAuthenticationProvider.class))
                 .httpProvider(mHttpProvider).buildClient();
         final Response mResponse = new Response.Builder()
                 .request(new Request.Builder().url("https://graph.microsoft.com/v1.0/$batch").build()).code(200)
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index 8cf23da47..f1a25ba62 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -42,8 +42,7 @@ public void setUp() throws Exception {
                 .request(new Request.Builder().url("https://a.b.c").build())
                 .protocol(Protocol.HTTP_1_1)
                 .code(200).message("OK").body(
-                   ResponseBody.create(MediaType.parse("application/json"),
-                        "{ \"id\": \"zzz\" }"
+                   ResponseBody.create("{ \"id\": \"zzz\" }", MediaType.parse("application/json")
                 ))
                 .addHeader("Content-Type", "application/json")
                 .build();
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
index 426b8763c..dbf528afd 100644
--- a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -35,9 +35,10 @@
  */
 public class BaseStreamRequestTests {
 
-    private BaseClient mBaseClient;
+    private BaseClient<Request> mBaseClient;
 
     @BeforeEach
+    @SuppressWarnings("unchecked")
     public void setUp() throws Exception {
         mBaseClient = mock(BaseClient.class);
     }
diff --git a/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
index e6d937d89..326d28d62 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RedirectHandlerTest.java
@@ -185,7 +185,7 @@ public void testGetRedirectForHeadMethod() {
     @Test
     public void testGetRedirectForPostMethod() {
         RedirectHandler redirectHandler = new RedirectHandler();
-        RequestBody body = RequestBody.create(MediaType.parse("application/json"),"");
+        RequestBody body = RequestBody.create("", MediaType.parse("application/json"));
         Request httppost = new Request.Builder().url(testurl).post(body).build();
         Response response = new Response.Builder()
                 .protocol(Protocol.HTTP_1_1)
diff --git a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
index 9a805e559..688d4812e 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
@@ -99,7 +99,7 @@ public void testRetryRequestForStatusCode() {
     @Test
     public void testRetryRequestWithTransferEncoding() {
         RetryHandler retryhandler = new RetryHandler();
-        Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create(MediaType.parse("application/json"), "TEST")).build();
+        Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create("TEST", MediaType.parse("application/json"))).build();
         Response response = new Response.Builder()
                 .protocol(Protocol.HTTP_1_1)
                 .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)
@@ -113,7 +113,7 @@ public void testRetryRequestWithTransferEncoding() {
     @Test
     public void testRetryRequestWithExponentialBackOff() {
         RetryHandler retryhandler = new RetryHandler();
-        Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create(MediaType.parse("application/json"), "TEST")).build();
+        Request httppost = new Request.Builder().url(testmeurl).post(RequestBody.create("TEST", MediaType.parse("application/json"))).build();
         Response response = new Response.Builder()
                 .protocol(Protocol.HTTP_1_1)
                 .code(HttpURLConnection.HTTP_GATEWAY_TIMEOUT)

From 7446b6b1684f22449c03758db31cddd999a808c6 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 08:54:03 -0500
Subject: [PATCH 190/213] - adds java 15 install to fix codeql build

---
 .github/workflows/codeql-analysis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index acbe219cf..270ccb4ef 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -22,6 +22,10 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 15
+
     # If this run was triggered by a pull request event, then checkout
     # the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2

From 6599f321d64979586d4500c1f53101d8b95576ed Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 18 Feb 2021 09:57:43 -0500
Subject: [PATCH 191/213] - fixes a bug where next page would always be null
 because of deserialization regression

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java  | 4 ++--
 .../graph/serializer/CollectionResponseSerializer.java        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index f7a5d4853..944b3c436 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -24,6 +24,7 @@
 
 import java.net.URL;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -118,11 +119,10 @@ protected java.util.concurrent.CompletableFuture<T2> sendAsync() throws ClientEx
      */
     @Nullable
     public T3 buildFromResponse(@Nonnull final T2 response) {
-        final List<com.microsoft.graph.options.Option> options = new java.util.ArrayList<com.microsoft.graph.options.Option>();
         try {
             final Object builder = response.nextLink() == null ? null : this.collRequestBuilderClass
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
-                    .newInstance(response.nextLink(), getBaseRequest().getClient(), options);
+                    .newInstance(response.nextLink(), getBaseRequest().getClient(), Collections.emptyList());
             final T3 page = (T3)this.collectionPageClass.getConstructor(response.getClass(), this.collRequestBuilderClass).newInstance(response, builder);
             return page;
         } catch(IllegalArgumentException | InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException | SecurityException ex) {
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
index e81e69263..997148cb9 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
@@ -95,6 +95,9 @@ public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonEle
             }
             final BaseCollectionResponse<T1> response = (BaseCollectionResponse<T1>)responseClass.getConstructor().newInstance();
             response.value = list;
+            final JsonElement potentialNextLink = jsonAsObject.get("@odata.nextLink");
+            if(potentialNextLink != null)
+                response.nextLink = potentialNextLink.getAsString();
             response.setRawObject(serializer, jsonAsObject);
             return response;
         } catch(NoSuchMethodException | InstantiationException | InvocationTargetException ex) {

From 6aba30d683c1e7ab009975cbdab6d5b79b6dd8b4 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 9 Feb 2021 10:30:25 -0500
Subject: [PATCH 192/213] - adds spotbugs base configuration

---
 build.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.gradle b/build.gradle
index 5e4db62f4..b434b4018 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ plugins {
     id 'maven-publish'
     id 'signing'
     id 'jacoco'
+    id 'com.github.spotbugs' version '4.6.0'
 }
 
 java {
@@ -32,6 +33,16 @@ jacoco {
     toolVersion = "0.8.7-SNAPSHOT" //https://github.com/gradle/gradle/issues/15038
 }
 
+spotbugsMain {
+    reports {
+        html {
+            enabled = true
+            destination = file("$buildDir/reports/spotbugs/main/spotbugs.html")
+            stylesheet = 'fancy-hist.xsl'
+        }
+    }
+}
+
 jacocoTestReport {
     reports {
         xml.enabled true

From 61d5640a884d4ab6a8cfab3f9d1224b70054ed63 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 12 Feb 2021 11:28:36 -0500
Subject: [PATCH 193/213] - fixes static analysis errors as example

---
 .../serializer/CollectionResponseSerializer.java      | 11 ++++++++---
 .../microsoft/graph/serializer/DefaultSerializer.java |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
index 997148cb9..c48374fe1 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionResponseSerializer.java
@@ -56,7 +56,7 @@ private CollectionResponseSerializer() {}
     @SuppressWarnings("unchecked")
     @Nullable
     public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonElement json, @Nonnull final Type typeOfT, @Nonnull final ILogger logger) throws JsonParseException {
-        if (json == null || !json.isJsonObject()| !typeOfT.getClass().equals(Class.class)) {
+        if (json == null || !json.isJsonObject() || !typeOfT.getClass().equals(Class.class)) {
             return null;
         }
         serializer = new DefaultSerializer(logger);
@@ -86,8 +86,13 @@ public static <T1> BaseCollectionResponse<T1> deserialize(@Nonnull final JsonEle
                 if(sourceElement.isJsonObject()) {
                     final JsonObject sourceObject = sourceElement.getAsJsonObject();
                     Class<?> entityClass = serializer.getDerivedClass(sourceObject, baseEntityClass);
-                    if(entityClass == null && baseEntityClass != null)
-                        entityClass = baseEntityClass; // it is possible the odata type is absent or we can't find the derived type (not in SDK yet)
+                    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);
                     ((IJsonBackedObject)targetObject).setRawObject(serializer, sourceObject);
                     list.add(targetObject);
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 63e6e4bfb..5ab663775 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -352,7 +352,7 @@ private void addAdditionalDataFromManagerToJson(AdditionalDataManager additional
 	 * @return			the derived class if found, or null if not applicable
 	 */
 	@Nullable
-	public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nonnull final Class<?> parentClass) {
+	public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nullable final Class<?> parentClass) {
 		//Identify the odata.type information if provided
 		if (jsonObject.get(ODATA_TYPE_KEY) != null) {
 			/** #microsoft.graph.user or #microsoft.graph.callrecords.callrecord */

From da944a54b71fad4baec2c4158eff5527a209593d Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 12 Feb 2021 15:40:36 -0500
Subject: [PATCH 194/213] - fixes a first set of linting issues

---
 .../graph/content/BatchRequestBuilder.java    |  2 +-
 .../com/microsoft/graph/core/BaseClient.java  |  3 +-
 .../com/microsoft/graph/core/Multipart.java   | 88 +++++++++----------
 .../graph/http/BaseCollectionPage.java        |  2 +-
 .../com/microsoft/graph/http/BaseRequest.java |  8 +-
 .../http/GraphFatalServiceException.java      |  2 +-
 .../graph/http/GraphServiceException.java     | 43 +++++----
 .../microsoft/graph/http/IHttpRequest.java    |  4 +-
 .../graph/options/FunctionOption.java         |  3 +-
 .../microsoft/graph/options/HeaderOption.java |  2 +-
 .../com/microsoft/graph/options/Option.java   |  5 +-
 .../microsoft/graph/options/QueryOption.java  | 11 +--
 .../http/GraphServiceExceptionTests.java      | 23 ++---
 13 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java b/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java
index 731dfd9aa..c6ceda75d 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestBuilder.java
@@ -39,7 +39,7 @@ public class BatchRequestBuilder extends BaseRequestBuilder<BatchResponseContent
      * @param client the client to use to execute the request
      * @param options the request options
      */
-    public BatchRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nonnull final List<? extends Option> options) {
+    public BatchRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nonnull final List<? extends Option> options) {
         super(requestUrl, client, options);
     }
     /**
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index a97f6c030..6a94a3c66 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -35,6 +35,7 @@
 
 import javax.annotation.Nullable;
 
+import java.util.Collections;
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -110,7 +111,7 @@ public CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url
      */
     @Nonnull
     public BatchRequestBuilder batch() {
-        return new BatchRequestBuilder(getServiceRoot() + "/$batch", this, null);
+        return new BatchRequestBuilder(getServiceRoot() + "/$batch", this, Collections.emptyList());
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/core/Multipart.java b/src/main/java/com/microsoft/graph/core/Multipart.java
index 9b83ce480..365be77e9 100644
--- a/src/main/java/com/microsoft/graph/core/Multipart.java
+++ b/src/main/java/com/microsoft/graph/core/Multipart.java
@@ -16,8 +16,8 @@
 
 /**
  * Helper for submitting multipart data
- * 
- * This follows the Network Working Group's RFC 
+ *
+ * This follows the Network Working Group's RFC
  * on multipart/form-data posting format:
  * https://www.ietf.org/rfc/rfc2388.txt
  */
@@ -28,7 +28,7 @@ public class Multipart {
 	/** Default encoding for multi-part requests */
 	public static final String MULTIPART_ENCODING = "US-ASCII";
 	private String contentType = "multipart/form-data";
-	
+
 	/**
 	 * Create a new multipart object
 	 */
@@ -36,7 +36,7 @@ public Multipart() {
 		out = new ByteArrayOutputStream();
 		boundary = "part_" + new BigInteger(130, new SecureRandom()).toString();
 	}
-	
+
 	/**
 	 * Get the multipart boundary for use in the request header
 	 * @return the multipart boundary
@@ -45,7 +45,7 @@ public Multipart() {
 	public String getBoundary() {
 		return boundary;
 	}
-	
+
 	/**
 	 * Set the multipart boundary for use in the request header
 	 * @param boundary The multipart boundary
@@ -53,7 +53,7 @@ public String getBoundary() {
 	public void setBoundary(@Nonnull final String boundary) {
 		this.boundary = boundary;
 	}
-	
+
 	/**
 	 * Get the contentType for use in the request header
 	 * @return the multipart Content-Type
@@ -62,7 +62,7 @@ public void setBoundary(@Nonnull final String boundary) {
 	public String getContentType() {
 		return contentType;
 	}
-	
+
 	/**
 	 * Set the contentType for use in the request header
 	 * @param contentType The multipart Content-Type
@@ -70,7 +70,7 @@ public String getContentType() {
 	public void setContentType(@Nonnull final String contentType) {
 		this.contentType = contentType;
 	}
-	
+
 	/**
 	 * Get the Content-Type header to send the multipart request
 	 * @return the multipart header option
@@ -79,72 +79,71 @@ public void setContentType(@Nonnull final String contentType) {
 	public HeaderOption header() {
 		return new HeaderOption("Content-Type", contentType + "; boundary=\"" + boundary + "\"");
 	}
-	
+
 	private void writePartData(String partContent, byte[] byteArray) throws IOException{
 		out.write(partContent.getBytes(MULTIPART_ENCODING));
 		out.write(byteArray);
 		String returnContent = RETURN + RETURN;
 		out.write(returnContent.getBytes(MULTIPART_ENCODING));
 	}
-	
+
 	/**
 	 * Create content headers value and parameter
 	 * @param name The content header name
 	 * @param contentType The content header Content-Type
-	 * @param filename The content header filename 
-	 * @return content header value and parameter string 
+	 * @param filename The content header filename
+	 * @return content header value and parameter string
 	 */
 	@VisibleForTesting
 	String createPartHeader(String name, String contentType, String filename) {
 		StringBuilder partContent = new StringBuilder(addBoundary());
 		partContent.append("Content-Disposition: form-data");
         if(filename != null) {
-        	if(name != null) 
+        	if(name != null)
         		partContent.append("; name=\"").append(name).append("\"; filename=\"").append(filename).append("\"");
-        	else 
+        	else
         		partContent.append("; filename=\"").append(filename).append("\"");
         }
-        else if(name != null) 
+        else if(name != null)
         	partContent.append("; name=\"").append(name).append("\"");
         if(contentType != null)
         	partContent.append(RETURN).append("Content-Type: ").append(contentType);
         partContent.append(RETURN).append(RETURN);
         return partContent.toString();
 	}
-	
+
 	/**
 	 * Create content headers value and parameter
 	 * @param contentValue The content header value
-	 * @param contentDispParameter Map containing content paramter's key and value pair 
-	 * @return content header value and parameter string 
+	 * @param contentDispParameter Map containing content paramter's key and value pair
+	 * @return content header value and parameter string
 	 */
 	@Nonnull
 	public static String createContentHeaderValue(@Nonnull final String contentValue, @Nullable final Map<String, String> contentDispParameter) {
-		String contentHeaderValue = contentValue;
+        final StringBuilder builder = new StringBuilder(contentValue);
 
 		if(contentDispParameter != null) {
 			for(Map.Entry<String,String> entry : contentDispParameter.entrySet())
-				contentHeaderValue += ";" + entry.getKey() + "=\"" + entry.getValue() + "\"";
+				builder.append(";" + entry.getKey() + "=\"" + entry.getValue() + "\"");
 		}
-		return contentHeaderValue;
+		return builder.toString();
 	}
-	
+
 	/**
 	 * Create content headers header-name, value and parameter string
 	 * @param headers Map containing Header-name and header-value pair
 	 */
 	private String createPartHeader(Map<String, String> headers) {
-        String partContent = addBoundary();
-        String defaultPartContent = "Content-Disposition: form-data;" + RETURN + "Content-Type: " + contentType + RETURN + RETURN;
-        
-        if(headers != null) {         
-              for(Map.Entry<String,String> entry : headers.entrySet())
-                    partContent += entry.getKey() +": "+entry.getValue() + RETURN;
-              partContent += RETURN;
-        }
-        else 
-              partContent += defaultPartContent;  
-        return partContent;
+        final StringBuilder builder = new StringBuilder(addBoundary());
+        final String defaultPartContent = "Content-Disposition: form-data;" + RETURN + "Content-Type: " + contentType + RETURN + RETURN;
+
+        if(headers != null) {
+            for(Map.Entry<String,String> entry : headers.entrySet())
+                builder.append(entry.getKey() +": "+entry.getValue() + RETURN);
+            builder.append(RETURN);
+        } else
+            builder.append(defaultPartContent);
+        return builder.toString();
 	}
 
 	/**
@@ -170,7 +169,7 @@ private void addData(String name, String contentType, String filename, byte[] by
 	public void addFormData(@Nonnull final String name, @Nonnull final String contentType, @Nonnull final byte[] byteArray) throws IOException {
 		addData(name, contentType, null, byteArray);
 	}
-	
+
 	/**
 	 * Add a part to the multipart body
 	 * @param contentType The MIME type (text/html, video/mp4, etc.)
@@ -180,7 +179,7 @@ public void addFormData(@Nonnull final String name, @Nonnull final String conten
 	public void addPart(@Nonnull final String contentType, @Nonnull final byte[] byteArray) throws IOException {
 		addData(null, contentType, null, byteArray);
 	}
-	
+
 	/**
      * Add a part to the multipart body
      * @param headers Map containing Header's header-name(eg: Content-Disposition, Content-Type, etc..) and header's value-parameter string
@@ -191,7 +190,7 @@ public void addPart(@Nonnull final Map<String, String> headers, @Nonnull final b
            final String partContent = createPartHeader(headers);
            writePartData(partContent, content);
      }
-	
+
 	/**
 	 * Add an HTML part to the multipart body
 	 * @param name The name of the part
@@ -201,7 +200,7 @@ public void addPart(@Nonnull final Map<String, String> headers, @Nonnull final b
 	public void addHtmlPart(@Nonnull final String name, @Nonnull final byte[] content) throws IOException {
 		addFormData(name, "text/html", content);
 	}
-	
+
 	/**
 	 * Add a file part to the multipart body
 	 * @param name The name of the part
@@ -210,11 +209,12 @@ public void addHtmlPart(@Nonnull final String name, @Nonnull final byte[] conten
 	 * @throws IOException Throws an exception if the output stream cannot be written to
 	 */
 	public void addFilePart(@Nonnull final String name, @Nonnull final String contentType, @Nonnull final java.io.File file) throws IOException {
-		final InputStream fileStream = new FileInputStream(file);
-		final byte[] fileBytes = getByteArray(fileStream);
-		addData(name, contentType, file.getName(), fileBytes);
+		try(final InputStream fileStream = new FileInputStream(file)) {
+		    final byte[] fileBytes = getByteArray(fileStream);
+		    addData(name, contentType, file.getName(), fileBytes);
+        }
 	}
-	
+
 	/**
 	 * Adds a boundary at the beginning of a new part
 	 * @return The boundary
@@ -222,7 +222,7 @@ public void addFilePart(@Nonnull final String name, @Nonnull final String conten
 	private String addBoundary() {
 		return "--" + boundary + RETURN;
 	}
-	
+
 	/**
 	 * Adds a boundary at the end of the multipart body
 	 * @return The boundary
@@ -230,7 +230,7 @@ private String addBoundary() {
 	private String addEnding() {
 		return "--" + boundary + "--";
 	}
-	
+
 	/**
 	 * Returns a full multipart body byte array
 	 * @return The byte[] representation of the multipart object
@@ -242,7 +242,7 @@ public byte[] content() throws IOException {
 		finalStream.write(addEnding().getBytes(MULTIPART_ENCODING));
 		return finalStream.toByteArray();
 	}
-	
+
     /**
      * Helper method to convert an InputStream to a byte[]
      * @param in The input stream to convert
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
index 0411eab2d..fce85908a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionPage.java
@@ -83,7 +83,7 @@ public BaseCollectionPage(@Nonnull final List<T> pageContents, @Nullable final T
      * @param nextRequestBuilder the request builder for the next page
      * @param responseAdditionalData the additional data returned by the response
      */
-    public BaseCollectionPage(@Nonnull final List<T> pageContents, @Nonnull final T2 nextRequestBuilder, @Nonnull final AdditionalDataManager responseAdditionalData) {
+    public BaseCollectionPage(@Nonnull final List<T> pageContents, @Nullable final T2 nextRequestBuilder, @Nonnull final AdditionalDataManager responseAdditionalData) {
         this(pageContents, nextRequestBuilder);
         this.additionalDataManager().putAll(responseAdditionalData);
     }
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index a73776532..c0d76746d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -177,8 +177,12 @@ public BaseRequest(@Nonnull final String requestUrl,
     @Override
     @Nullable
     public URL getRequestUrl() {
-        String requestUrl = addFunctionParameters();
-        final Builder uriBuilder = HttpUrl.parse(requestUrl).newBuilder();
+        final String requestUrl = addFunctionParameters();
+        final HttpUrl parsedUrl = HttpUrl.parse(requestUrl);
+        if (parsedUrl == null) {
+            throw new ClientException("Invalid URL " + requestUrl, null);
+        }
+        final Builder uriBuilder = parsedUrl.newBuilder();
 
         for (final QueryOption option : queryOptions) {
         	uriBuilder.addQueryParameter(option.getName(), option.getValue().toString());
diff --git a/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java b/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
index ed3fdacb7..c12eea883 100644
--- a/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphFatalServiceException.java
@@ -52,7 +52,7 @@ protected GraphFatalServiceException(@Nonnull final String method,
                                          @Nonnull final List<String> requestHeaders,
                                          @Nullable final String requestBody,
                                          final int responseCode,
-                                         @Nullable final String responseMessage,
+                                         @Nonnull final String responseMessage,
                                          @Nonnull final List<String> responseHeaders,
                                          @Nullable final GraphErrorResponse error,
                                          final boolean verbose) {
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index d5b6516dc..7ef12cd26 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -35,18 +35,22 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TreeMap;
+import java.util.Map.Entry;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import okhttp3.Headers;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -144,7 +148,7 @@ protected GraphServiceException(@Nonnull final String method,
                                     @Nonnull final List<String> requestHeaders,
                                     @Nullable final String requestBody,
                                     final int responseCode,
-                                    @Nullable final String responseMessage,
+                                    @Nonnull final String responseMessage,
                                     @Nonnull final List<String> responseHeaders,
                                     @Nullable final GraphErrorResponse error,
                                     final boolean verbose) {
@@ -333,9 +337,10 @@ public GraphError getServiceError() {
     public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpRequest request,
                                                                  @Nullable final T serializable,
                                                                  @Nonnull final ISerializer serializer,
-                                                                 @Nullable final Response response,
+                                                                 @Nonnull final Response response,
                                                                  @Nonnull final ILogger logger)
             throws IOException {
+        Objects.requireNonNull(response, "reponse parameter cannot be null");
         final String method = response.request().method();
         final String url = request.getRequestUrl().toString();
         final List<String> requestHeaders = new LinkedList<>();
@@ -351,7 +356,7 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
 
             sb.append(" {");
             if (isVerbose) {
-            	sb.append(bytes);
+            	sb.append(Arrays.toString(bytes));
             } else {
 	            for (int i = 0; i < MAX_BYTE_COUNT_BEFORE_TRUNCATION && i < bytes.length; i++) {
 	                sb.append(bytes[i]).append(", ");
@@ -394,21 +399,14 @@ public static GraphServiceException createFromResponse(@Nullable final String ur
         @Nonnull final Map<String,String> headers, @Nonnull final String responseMessage, final int responseCode,
         @Nonnull final GraphErrorResponse error, final boolean isVerbose) {
         final List<String> responseHeaders = new LinkedList<>();
-        for (final String key : headers.keySet()) {
-            final String fieldPrefix;
-            if (key == null) {
-                fieldPrefix = "";
-            } else {
-                fieldPrefix = key + " : ";
-            }
-            responseHeaders.add(fieldPrefix + headers.get(key));
+        for (final Entry<String, String> entry : headers.entrySet()) {
+            responseHeaders.add(entry.getKey() + (entry.getKey() == null ? "" : " : " ) + entry.getValue());
         }
 
 
-
         if (responseCode >= INTERNAL_SERVER_ERROR) {
-            return new GraphFatalServiceException(method,
-                    url,
+            return new GraphFatalServiceException(method == null ? "" : method,
+                    url == null ? "" : url,
                     requestHeaders,
                     requestBody,
                     responseCode,
@@ -418,8 +416,8 @@ public static GraphServiceException createFromResponse(@Nullable final String ur
                     isVerbose);
         }
 
-        return new GraphServiceException(method,
-                url,
+        return new GraphServiceException(method == null ? "" : method,
+                url == null ? "" : url,
                 requestHeaders,
                 requestBody,
                 responseCode,
@@ -432,10 +430,17 @@ public static GraphServiceException createFromResponse(@Nullable final String ur
     private static GraphErrorResponse parseErrorResponse(@Nonnull ISerializer serializer,
                                                          @Nonnull Response response)
             throws IOException {
-
+        Objects.requireNonNull(serializer, "serializer is required.");
+        Objects.requireNonNull(response, "response is required.");
         byte[] responseBytes;
-        try(final InputStream is = response.body().byteStream()) {
-            responseBytes = ByteStreams.toByteArray(is);
+        try(final ResponseBody body = response.body()) {
+            if(body == null) {
+                responseBytes = new byte[]{};
+            } else {
+                try(final InputStream is = body.byteStream()) {
+                    responseBytes = ByteStreams.toByteArray(is);
+                }
+            }
         }
         GraphErrorResponse error;
         try {
diff --git a/src/main/java/com/microsoft/graph/http/IHttpRequest.java b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
index 76f674e17..c032d4096 100644
--- a/src/main/java/com/microsoft/graph/http/IHttpRequest.java
+++ b/src/main/java/com/microsoft/graph/http/IHttpRequest.java
@@ -181,7 +181,7 @@ public interface IHttpRequest {
      */
     @Nullable
     default <nativeRequestType> nativeRequestType getHttpRequest() throws ClientException {
-        return getHttpRequest(null); //TODO do something for the nonnull annotation
+        return getHttpRequest(null);
     }
 
     /**
@@ -193,6 +193,6 @@ default <nativeRequestType> nativeRequestType getHttpRequest() throws ClientExce
      * @return the Request object to be executed
      */
     @Nullable
-    <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException;
+    <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nullable final requestBodyType serializedObject) throws ClientException;
 }
 
diff --git a/src/main/java/com/microsoft/graph/options/FunctionOption.java b/src/main/java/com/microsoft/graph/options/FunctionOption.java
index 95c7de873..7ca46895b 100644
--- a/src/main/java/com/microsoft/graph/options/FunctionOption.java
+++ b/src/main/java/com/microsoft/graph/options/FunctionOption.java
@@ -23,6 +23,7 @@
 package com.microsoft.graph.options;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /** Represents an option to use with OData methods */
 public class FunctionOption extends Option {
@@ -33,7 +34,7 @@ public class FunctionOption extends Option {
      * @param name  the name of the option
      * @param value the value of the option
      */
-    public FunctionOption(@Nonnull final String name, @Nonnull final Object value) {
+    public FunctionOption(@Nonnull final String name, @Nullable final Object value) {
         super(name, value);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/options/HeaderOption.java b/src/main/java/com/microsoft/graph/options/HeaderOption.java
index ff336254f..cf09dff9b 100644
--- a/src/main/java/com/microsoft/graph/options/HeaderOption.java
+++ b/src/main/java/com/microsoft/graph/options/HeaderOption.java
@@ -36,7 +36,7 @@ public class HeaderOption extends Option {
      * @param name  the name of the header
      * @param value the value of the header
      */
-    public HeaderOption(@Nonnull final String name, @Nonnull final String value) {
+    public HeaderOption(@Nonnull final String name, @Nullable final String value) {
         super(name, value);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/options/Option.java b/src/main/java/com/microsoft/graph/options/Option.java
index 5def6285f..ef67b39c4 100644
--- a/src/main/java/com/microsoft/graph/options/Option.java
+++ b/src/main/java/com/microsoft/graph/options/Option.java
@@ -25,6 +25,7 @@
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * An option that is settable for a request
@@ -47,7 +48,7 @@ public class Option {
      * @param name  the name of the option
      * @param value the value of the option
      */
-    protected Option(@Nonnull final String name, @Nonnull final Object value) {
+    protected Option(@Nonnull final String name, @Nullable final Object value) {
         Objects.requireNonNull(name, "name should not be null");
         if(name.isEmpty()) {
             throw new IllegalArgumentException("name should not empty");
@@ -71,7 +72,7 @@ public String getName() {
      *
      * @return the value of the option
      */
-    @Nonnull
+    @Nullable
     public Object getValue() {
         return value;
     }
diff --git a/src/main/java/com/microsoft/graph/options/QueryOption.java b/src/main/java/com/microsoft/graph/options/QueryOption.java
index ed34eb2b8..59c8f6e36 100644
--- a/src/main/java/com/microsoft/graph/options/QueryOption.java
+++ b/src/main/java/com/microsoft/graph/options/QueryOption.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
@@ -23,6 +23,7 @@
 package com.microsoft.graph.options;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 /**
  * A query parameter
  */
@@ -30,11 +31,11 @@ public class QueryOption extends Option {
 
     /**
      * Create a query parameter option object
-     * 
+     *
      * @param name  the name of the query parameter
      * @param value the value of the query parameter
      */
-    public QueryOption(@Nonnull final String name, @Nonnull final Object value) {
+    public QueryOption(@Nonnull final String name, @Nullable final Object value) {
         super(name, value);
     }
 }
diff --git a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
index f0942a7bf..d092010b6 100644
--- a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
@@ -4,13 +4,9 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -25,6 +21,7 @@
 
 import com.microsoft.graph.core.GraphErrorCodes;
 import com.microsoft.graph.logger.DefaultLogger;
+import com.microsoft.graph.serializer.ISerializer;
 
 public class GraphServiceExceptionTests {
 
@@ -57,11 +54,9 @@ public void testVerboseError() {
 	}
 
 	@Test
-    public void testcreateFromResponse() {
+    public void testcreateFromResponse() throws IOException {
 		DefaultLogger logger = new DefaultLogger();
         GraphServiceException exception = null;
-        Boolean success = false;
-        Boolean failure = false;
         final Response response = new Response.Builder()
                 .request(new Request.Builder().url("https://a.b.c").build())
                 .protocol(Protocol.HTTP_1_1)
@@ -71,20 +66,12 @@ public void testcreateFromResponse() {
                         MediaType.parse("application/json")
                 ))
                 .build();
-        try{
-            IHttpRequest mRequest = mock(IHttpRequest.class);
-            when(mRequest.getRequestUrl()).thenReturn(new URL("http://localhost"));
-            exception = GraphServiceException.createFromResponse(mRequest ,null,null,response,logger);
-            success = true;
-        }catch (IOException ex){
-            failure = true;
-        }
 
-        assertTrue(success);
-        assertFalse(failure);
+        IHttpRequest mRequest = mock(IHttpRequest.class);
+        when(mRequest.getRequestUrl()).thenReturn(new URL("http://localhost"));
+        exception = GraphServiceException.createFromResponse(mRequest ,null, mock(ISerializer.class),response,logger);
 
         String message = exception.getMessage();
-        assertTrue(message.indexOf("Error code: Unable to parse error response message") == 0);
         assertTrue(message.indexOf("http://localhost") > 0);
     }
 }

From 99ca9e676d40afae41f5012005d188e6e7d5f2a8 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 09:18:47 -0500
Subject: [PATCH 195/213] - lints serializer package

---
 .../com/microsoft/graph/serializer/DefaultSerializer.java | 4 ++--
 .../java/com/microsoft/graph/serializer/GsonFactory.java  | 3 ++-
 .../java/com/microsoft/graph/serializer/ISerializer.java  | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 5ab663775..51075262c 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -82,7 +82,7 @@ public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final
 	@Nullable
 	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
         T result = null;
-        try (final InputStreamReader streamReader =  new InputStreamReader(inputStream)) {
+        try (final InputStreamReader streamReader =  new InputStreamReader(inputStream, "UTF-8")) {
 			final JsonElement rawElement = gson.fromJson(streamReader, JsonElement.class);
 			result = deserializeObject(rawElement, clazz, responseHeaders);
         } catch (IOException ex) {
@@ -276,7 +276,7 @@ private void getChildAdditionalData(final IJsonBackedObject serializableObject,
 			try {
 				final Object fieldObject = field.get(serializableObject);
 				final JsonElement fieldJsonElement = outJson.get(field.getName());
-				if(fieldObject == null || field == null || fieldJsonElement == null)
+				if(fieldObject == null || fieldJsonElement == null)
 					continue;
 
 				// If the object is a HashMap, iterate through its children
diff --git a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
index d80a5b371..e51b998cf 100644
--- a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
+++ b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
@@ -40,6 +40,7 @@
 import java.lang.reflect.Type;
 import java.text.ParseException;
 import java.time.OffsetDateTime;
+import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
 
@@ -112,7 +113,7 @@ public JsonElement serialize(final byte[] src,
                 try {
                     return new JsonPrimitive(ByteArraySerializer.serialize(src));
                 } catch (final Exception e) {
-                    logger.logError(PARSING_MESSAGE + src, e);
+                    logger.logError(PARSING_MESSAGE + Arrays.toString(src), e);
                     return null;
                 }
             }
diff --git a/src/main/java/com/microsoft/graph/serializer/ISerializer.java b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
index cf3efc973..7e64de2d6 100644
--- a/src/main/java/com/microsoft/graph/serializer/ISerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ISerializer.java
@@ -59,7 +59,7 @@ default <T> T deserializeObject(@Nonnull final String inputString, @Nonnull fina
      * @return                the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
+    <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders);
 
     /**
      * Deserialize an object from the input stream
@@ -84,7 +84,7 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
      * @return                the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders);
+    <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders);
 
     /**
      * Deserialize an object from the input JsonElement
@@ -95,7 +95,7 @@ default <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
      * @return the deserialized item from the input string
      */
     @Nullable
-    default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz) {
+    default <T> T deserializeObject(@Nonnull final JsonElement jsonElement, @Nonnull final Class<T> clazz) {
         return deserializeObject(jsonElement, clazz, null);
     }
 
@@ -109,7 +109,7 @@ default <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class
      * @return                the deserialized item from the input string
      */
     @Nullable
-    <T> T deserializeObject(@Nonnull JsonElement jsonElement, @Nonnull Class<T> clazz, @Nonnull Map<String, List<String>> responseHeaders);
+    <T> T deserializeObject(@Nonnull final JsonElement jsonElement, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders);
 
     /**
      * Serializes an object into a string

From e408ea0d8f10143f22883eb3dde69cc41a1bf844 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 09:52:06 -0500
Subject: [PATCH 196/213] - lints httpcore package

---
 .../graph/httpcore/AuthenticationHandler.java | 14 +++---
 .../graph/httpcore/ChaosHttpHandler.java      | 19 ++++----
 .../graph/httpcore/RedirectHandler.java       | 11 +++--
 .../graph/httpcore/RetryHandler.java          | 45 +++++++++++--------
 .../graph/httpcore/TelemetryHandler.java      | 14 +++---
 5 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
index 306e35e7b..daf8fc44c 100644
--- a/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/AuthenticationHandler.java
@@ -6,7 +6,6 @@
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 
-import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.httpcore.middlewareoption.MiddlewareType;
@@ -40,18 +39,19 @@ public AuthenticationHandler(@Nonnull final IAuthenticationProvider authProvider
     }
 
     @Override
-    @Nullable
+    @Nonnull
     public Response intercept(@Nonnull final Chain chain) throws IOException {
         Request originalRequest = chain.request();
 
-        if(originalRequest.tag(TelemetryOptions.class) == null)
-            originalRequest = originalRequest.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-        originalRequest.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
+        TelemetryOptions telemetryOptions = originalRequest.tag(TelemetryOptions.class);
+        if(telemetryOptions == null) {
+            telemetryOptions = new TelemetryOptions();
+            originalRequest = originalRequest.newBuilder().tag(TelemetryOptions.class, telemetryOptions).build();
+        }
+        telemetryOptions.setFeatureUsage(TelemetryOptions.AUTH_HANDLER_ENABLED_FLAG);
 
         try {
             final CompletableFuture<String> future = authProvider.getAuthorizationTokenAsync(originalRequest.url().url());
-            if(future == null)
-                return chain.proceed(originalRequest);
             final String accessToken = future.get();
             if(accessToken == null)
                 return chain.proceed(originalRequest);
diff --git a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
index 37970397a..e4eec8304 100644
--- a/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/ChaosHttpHandler.java
@@ -28,32 +28,35 @@ public class ChaosHttpHandler implements Interceptor {
     /**
      * constant string being used
      */
-    private final String RETRY_AFTER = "Retry-After";
+    private static final String RETRY_AFTER = "Retry-After";
     /**
      * Denominator for the failure rate (i.e. 1/X)
      */
-    private final int failureRate = 3;
+    private static final int failureRate = 3;
     /**
      * default value to return on retry after
      */
-    private final String retryAfterValue = "10";
+    private static final String retryAfterValue = "10";
     /**
      * body to respond on failed requests
      */
-    private final String responseBody = "{\"error\": {\"code\": \"TooManyRequests\",\"innerError\": {\"code\": \"429\",\"date\": \"2020-08-18T12:51:51\",\"message\": \"Please retry after\",\"request-id\": \"94fb3b52-452a-4535-a601-69e0a90e3aa2\",\"status\": \"429\"},\"message\": \"Please retry again later.\"}}";
+    private static final String responseBody = "{\"error\": {\"code\": \"TooManyRequests\",\"innerError\": {\"code\": \"429\",\"date\": \"2020-08-18T12:51:51\",\"message\": \"Please retry after\",\"request-id\": \"94fb3b52-452a-4535-a601-69e0a90e3aa2\",\"status\": \"429\"},\"message\": \"Please retry again later.\"}}";
     /**
      * Too many requests status code
      */
     public static final int MSClientErrorCodeTooManyRequests = 429;
 
     @Override
-    @Nullable
+    @Nonnull
     public Response intercept(@Nonnull final Chain chain) throws IOException {
         Request request = chain.request();
 
-        if(request.tag(TelemetryOptions.class) == null)
-            request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-        request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
+        TelemetryOptions telemetryOptions = request.tag(TelemetryOptions.class);
+        if(telemetryOptions == null) {
+            telemetryOptions = new TelemetryOptions();
+            request = request.newBuilder().tag(TelemetryOptions.class, telemetryOptions).build();
+        }
+        telemetryOptions.setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
 
         final int dice = ThreadLocalRandom.current().nextInt(1, Integer.MAX_VALUE);
 
diff --git a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
index 34b52b2d7..d66a36fbd 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RedirectHandler.java
@@ -115,13 +115,16 @@ Request getRedirect(
 
     // Intercept request and response made to network
     @Override
-    @Nullable
+    @Nonnull
     public Response intercept(@Nonnull final Chain chain) throws IOException {
         Request request = chain.request();
 
-        if(request.tag(TelemetryOptions.class) == null)
-            request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-        request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
+        TelemetryOptions telemetryOptions = request.tag(TelemetryOptions.class);
+        if(telemetryOptions == null) {
+            telemetryOptions = new TelemetryOptions();
+            request = request.newBuilder().tag(TelemetryOptions.class, telemetryOptions).build();
+        }
+        telemetryOptions.setFeatureUsage(TelemetryOptions.REDIRECT_HANDLER_ENABLED_FLAG);
 
         Response response = null;
         int requestsCount = 1;
diff --git a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
index 2881ed68f..67bc9804c 100644
--- a/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/RetryHandler.java
@@ -16,6 +16,7 @@
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
+import okhttp3.ResponseBody;
 
 /**
  * The middleware responsible for retrying requests when they fail because of transient issues
@@ -32,27 +33,27 @@ public class RetryHandler implements Interceptor{
     /**
      * Header name to track the retry attempt number
      */
-    private final String RETRY_ATTEMPT_HEADER = "Retry-Attempt";
+    private static final String RETRY_ATTEMPT_HEADER = "Retry-Attempt";
     /**
      * Header name for the retry after information
      */
-    private final String RETRY_AFTER = "Retry-After";
+    private static final String RETRY_AFTER = "Retry-After";
     /**
      * Header name for the transfer information
      */
-    private final String TRANSFER_ENCODING = "Transfer-Encoding";
+    private static final String TRANSFER_ENCODING = "Transfer-Encoding";
     /**
      * Chunked encoding header value
      */
-    private final String TRANSFER_ENCODING_CHUNKED = "chunked";
+    private static final String TRANSFER_ENCODING_CHUNKED = "chunked";
     /**
      * Binary content type header value
      */
-    private final String APPLICATION_OCTET_STREAM = "application/octet-stream";
+    private static final String APPLICATION_OCTET_STREAM = "application/octet-stream";
     /**
      * Header name for the content type
      */
-    private final String CONTENT_TYPE = "Content-Type";
+    private static final String CONTENT_TYPE = "Content-Type";
 
     /**
      * Too many requests status code
@@ -70,7 +71,7 @@ public class RetryHandler implements Interceptor{
     /**
      * One second as milliseconds
      */
-    private final long DELAY_MILLISECONDS = 1000;
+    private static final long DELAY_MILLISECONDS = 1000;
 
     private final ILogger logger;
 
@@ -114,7 +115,8 @@ boolean retryRequest(Response response, int executionCount, Request request, Ret
         // Payloads with forward only streams will be have the responses returned
         // without any retry attempt.
         shouldRetry =
-                (executionCount <= retryOptions.maxRetries())
+                retryOptions != null
+                && executionCount <= retryOptions.maxRetries()
                 && checkStatus(statusCode) && isBuffered(response, request)
                 && shouldRetryCallback != null
                 && shouldRetryCallback.shouldRetry(retryOptions.delay(), executionCount, request, response);
@@ -155,7 +157,7 @@ boolean checkStatus(int statusCode) {
                 || statusCode == MSClientErrorCodeGatewayTimeout);
     }
 
-    boolean isBuffered(Response response, Request request) {
+    boolean isBuffered(final Response response, final Request request) {
         String methodName = request.method();
         if(methodName.equalsIgnoreCase("GET") || methodName.equalsIgnoreCase("DELETE") || methodName.equalsIgnoreCase("HEAD") || methodName.equalsIgnoreCase("OPTIONS"))
             return true;
@@ -164,11 +166,12 @@ boolean isBuffered(Response response, Request request) {
                 methodName.equalsIgnoreCase("PUT") ||
                 methodName.equalsIgnoreCase("PATCH");
 
-        if(isHTTPMethodPutPatchOrPost) {
-            boolean isStream = response.header(CONTENT_TYPE)!=null && response.header(CONTENT_TYPE).equalsIgnoreCase(APPLICATION_OCTET_STREAM);
+        if(isHTTPMethodPutPatchOrPost && response != null) {
+            final String contentTypeHeaderValue = response.header(CONTENT_TYPE);
+            final boolean isStream = contentTypeHeaderValue!=null && contentTypeHeaderValue.equalsIgnoreCase(APPLICATION_OCTET_STREAM);
             if(!isStream) {
-                String transferEncoding = response.header(TRANSFER_ENCODING);
-                boolean isTransferEncodingChunked = (transferEncoding != null) &&
+                final String transferEncoding = response.header(TRANSFER_ENCODING);
+                final boolean isTransferEncodingChunked = (transferEncoding != null) &&
                         transferEncoding.equalsIgnoreCase(TRANSFER_ENCODING_CHUNKED);
 
                 if(request.body() != null && isTransferEncodingChunked)
@@ -179,13 +182,16 @@ boolean isBuffered(Response response, Request request) {
     }
 
     @Override
-    @Nullable
+    @Nonnull
     public Response intercept(@Nonnull final Chain chain) throws IOException {
         Request request = chain.request();
 
-        if(request.tag(TelemetryOptions.class) == null)
-            request = request.newBuilder().tag(TelemetryOptions.class, new TelemetryOptions()).build();
-        request.tag(TelemetryOptions.class).setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
+        TelemetryOptions telemetryOptions = request.tag(TelemetryOptions.class);
+        if(telemetryOptions == null) {
+            telemetryOptions = new TelemetryOptions();
+            request = request.newBuilder().tag(TelemetryOptions.class, telemetryOptions).build();
+        }
+        telemetryOptions.setFeatureUsage(TelemetryOptions.RETRY_HANDLER_ENABLED_FLAG);
 
         Response response = chain.proceed(request);
 
@@ -198,8 +204,9 @@ public Response intercept(@Nonnull final Chain chain) throws IOException {
             request = request.newBuilder().addHeader(RETRY_ATTEMPT_HEADER, String.valueOf(executionCount)).build();
             executionCount++;
             if(response != null) {
-                if(response.body() != null)
-                    response.body().close();
+                final ResponseBody body = response.body();
+                if(body != null)
+                    body.close();
                 response.close();
             }
             response = chain.proceed(request);
diff --git a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
index a3c6de666..fdf1f53ec 100644
--- a/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
+++ b/src/main/java/com/microsoft/graph/httpcore/TelemetryHandler.java
@@ -45,7 +45,7 @@ public class TelemetryHandler implements Interceptor{
     private static final String DEFAULT_VERSION_VALUE = "0";
 
     @Override
-    @Nullable
+    @Nonnull
     public Response intercept(@Nonnull final Chain chain) throws IOException {
         final Request request = chain.request();
         final Request.Builder telemetryAddedBuilder = request.newBuilder();
@@ -87,10 +87,14 @@ private String getAndroidAPILevelInternal() {
                     break;
                 }
             }
-            final Field sdkVersionField = versionClass.getField("SDK_INT");
-            final Object value = sdkVersionField.get(null);
-            final String valueStr = String.valueOf(value);
-            return valueStr == null || valueStr == "" ? DEFAULT_VERSION_VALUE : valueStr;
+            if(versionClass == null)
+                return DEFAULT_VERSION_VALUE;
+            else {
+                final Field sdkVersionField = versionClass.getField("SDK_INT");
+                final Object value = sdkVersionField.get(null);
+                final String valueStr = String.valueOf(value);
+                return valueStr == null || valueStr.equals("") ? DEFAULT_VERSION_VALUE : valueStr;
+            }
         } catch (IllegalAccessException | ClassNotFoundException | NoSuchFieldException ex) {
             // we're not on android and return "0" to align with java version which returns "0" when running on android
             return DEFAULT_VERSION_VALUE;

From b225b775cde22379f6202ddc56a1fe496408cfbf Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 09:58:50 -0500
Subject: [PATCH 197/213] - lints content package

---
 .../java/com/microsoft/graph/content/BatchRequestContent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
index 8a6f7d163..935f24c1c 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequestContent.java
@@ -138,10 +138,10 @@ public void removeBatchRequestStepWithId(@Nonnull final String ...stepIds) {
 
         for(final String stepId : stepIds) {
             Objects.requireNonNull(stepId, "parameter stepIds cannot contain null values");
-            requests.removeIf(x -> x.id == stepId);
+            requests.removeIf(x -> stepId.equals(x.id));
             for(final BatchRequestStep<?> step : requests) {
                 if(step.dependsOn != null) {
-                    step.dependsOn.removeIf(x -> x == stepId);
+                    step.dependsOn.removeIf(x -> stepId.equals(x));
                     if(step.dependsOn.isEmpty())
                         step.dependsOn = null; // so we don't send dependsOn: [] over the wire
                 }

From a017c5d815e08fda7f5a0160e7b23d53f2f50329 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 10:03:37 -0500
Subject: [PATCH 198/213] - fixes mocks after linting

---
 .../graph/httpcore/TelemetryHandlerTest.java      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
index e86be6903..795a88091 100644
--- a/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/TelemetryHandlerTest.java
@@ -2,9 +2,13 @@
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.net.URL;
+import java.util.concurrent.CompletableFuture;
 
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 import org.junit.jupiter.api.Test;
@@ -22,11 +26,12 @@ public void telemetryInitTest() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void interceptTest() throws IOException {
         final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"
                 +TelemetryHandler.VERSION;
-        final OkHttpClient client = HttpClients.createDefault(mock(IAuthenticationProvider.class));
+        final IAuthenticationProvider authProvider = mock(IAuthenticationProvider.class);
+        when(authProvider.getAuthorizationTokenAsync(any(URL.class))).thenReturn(CompletableFuture.completedFuture(""));
+        final OkHttpClient client = HttpClients.createDefault(authProvider);
         final Request request = new Request.Builder().url("https://graph.microsoft.com/v1.0/users/").build();
         final Response response = client.newCall(request).execute();
         assertNotNull(response);
@@ -36,10 +41,10 @@ public void interceptTest() throws IOException {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void arrayInterceptorsTest() throws IOException {
-
-        final AuthenticationHandler authenticationHandler = new AuthenticationHandler(mock(IAuthenticationProvider.class));
+        final IAuthenticationProvider authProvider = mock(IAuthenticationProvider.class);
+        when(authProvider.getAuthorizationTokenAsync(any(URL.class))).thenReturn(CompletableFuture.completedFuture(""));
+        final AuthenticationHandler authenticationHandler = new AuthenticationHandler(authProvider);
         final Interceptor[] interceptors = {new RetryHandler(), new RedirectHandler(), authenticationHandler};
         final OkHttpClient client = HttpClients.createFromInterceptors(interceptors);
         final String expectedHeader = TelemetryHandler.GRAPH_VERSION_PREFIX +"/"

From c9b5b43d1e9574bef6f6a11c3230b67325094e8c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 10:20:47 -0500
Subject: [PATCH 199/213] - lints concurrency package

---
 .../microsoft/graph/concurrency/ChunkedUploadRequest.java    | 2 +-
 .../graph/concurrency/ChunkedUploadResponseHandler.java      | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
index badb00375..3d4a99d23 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -63,7 +63,7 @@ protected ChunkedUploadRequest(@Nonnull final String requestUrl,
                                 final long totalLength) {
         this.data = new byte[chunkSize];
         System.arraycopy(chunk, 0, this.data, 0, chunkSize);
-        this.baseRequest = new BaseRequest<ChunkedUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends ChunkedUploadResult<UploadType>>)(new ChunkedUploadResult<UploadType>((UploadType)null)).getClass()) {
+        this.baseRequest = new BaseRequest<ChunkedUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends ChunkedUploadResult<UploadType>>)(new ChunkedUploadResult<>((UploadType)null)).getClass()) {
         };
         this.baseRequest.setHttpMethod(HttpMethod.PUT);
         this.baseRequest.addHeader(CONTENT_RANGE_HEADER_NAME,
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index ba7efc8ab..272d341da 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -39,6 +39,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import okhttp3.MediaType;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
 
@@ -105,7 +106,9 @@ public ChunkedUploadResult<UploadType> generateResult(
 				&& response.code() < HttpResponseCode.HTTP_MULTIPLE_CHOICES) {
             try(final ResponseBody body = response.body()) {
                 final String location = response.headers().get("Location");
-                if (body.contentType() != null && body.contentType().subtype().contains("json")) {
+                final MediaType contentType = body.contentType();
+                final String subType = contentType == null ? null : contentType.subtype();
+                if (subType != null && subType.contains("json")) {
                     return parseJsonUploadResult(body, serializer, logger);
                 } else if (location != null) {
                     logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");

From 328245674ce9a3575296ebec543a570d82f6b2be Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 10:40:05 -0500
Subject: [PATCH 200/213] - lints http package

---
 .../graph/http/CoreHttpProvider.java          | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 17cf3c5ff..4f8dbf059 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Scanner;
 
 import javax.annotation.Nonnull;
@@ -100,18 +101,13 @@ public class CoreHttpProvider implements IHttpProvider<Request> {
 	 */
 	public CoreHttpProvider(@Nonnull final ISerializer serializer,
 			@Nonnull final ILogger logger,
-			@Nullable final OkHttpClient httpClient) {
-		if (httpClient == null) {
-			throw new NullPointerException("httpClient");
-		} else if(serializer == null) {
-			throw new NullPointerException("serializer");
-		} else if(logger == null) {
-			throw new NullPointerException("logger");
-		} else {
-			this.serializer = serializer;
-			this.logger = logger;
-			this.corehttpClient = httpClient;
-        }
+			@Nonnull final OkHttpClient httpClient) {
+        Objects.requireNonNull(logger, "parameter logger cannot be null");
+        Objects.requireNonNull(serializer, "parameter serializer cannot be null");
+        Objects.requireNonNull(httpClient, "parameter httpClient cannot be null");
+        this.serializer = serializer;
+        this.logger = logger;
+        this.corehttpClient = httpClient;
 	}
 
 	/**
@@ -135,7 +131,7 @@ public ISerializer getSerializer() {
 	 * @return a future with the result
 	 */
 	@Override
-	@Nullable
+	@Nonnull
 	public <Result, Body> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable) {
@@ -157,13 +153,13 @@ public <Result, Body> java.util.concurrent.CompletableFuture<Result> sendAsync(@
      * @return                  a future with the result
      * @throws ClientException  this exception occurs if the request was unable to complete for any reason
      */
-    @Nullable
+    @Nonnull
     public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
                                                     @Nonnull final Class<Result> resultClass,
                                                     @Nullable final BodyType serializable,
-                                                    @Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler)
+                                                    @Nullable final IStatefulResponseHandler<Result, DeserializeType> handler)
             throws ClientException {
-        return sendFutureRequestInternal(request,
+        return sendRequestAsyncInternal(request,
                 resultClass,
                 serializable,
                 handler);
@@ -206,7 +202,7 @@ public <Result, Body> Result send(@Nonnull final IHttpRequest request,
 	public <Result, Body, DeserializeType> Result send(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable,
-			@Nonnull final IStatefulResponseHandler<Result, DeserializeType> handler) throws ClientException {
+			@Nullable final IStatefulResponseHandler<Result, DeserializeType> handler) throws ClientException {
             return sendRequestInternal(request, resultClass, serializable, handler);
 	}
 	/**
@@ -344,8 +340,8 @@ public MediaType contentType() {
 	 * @return                  the result from the request
 	 * @throws ClientException an exception occurs if the request was unable to complete for any reason
 	 */
-	@Nullable
-	private <Result, Body, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendFutureRequestInternal(@Nonnull final IHttpRequest request,
+	@Nonnull
+	private <Result, Body, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendRequestAsyncInternal(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable,
 			@Nullable final IStatefulResponseHandler<Result, DeserializeType> handler)
@@ -389,6 +385,7 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                                                                     final Class<Result> resultClass,
                                                                     final Body serializable,
                                                                     final IStatefulResponseHandler<Result, DeserializeType> handler) {
+        if (response == null) return null;
         final ResponseBody body = response.body();
         try {
             InputStream in = null;
@@ -412,7 +409,7 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                             request, response, this.serializer, this.logger);
                 }
 
-                if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+                if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR && body != null) {
                     logger.logDebug("Handling error response");
                     in = body.byteStream();
                     handleErrorResponse(request, serializable, response);
@@ -431,12 +428,13 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                     return handleEmptyResponse(responseHeaders, resultClass);
                 }
 
-                in = new BufferedInputStream(body.byteStream());
-
                 if (body == null || body.contentLength() == 0)
                     return null;
 
-                if (body.contentType() != null && body.contentType().subtype().contains("json")
+                in = new BufferedInputStream(body.byteStream());
+
+                final MediaType contentType = body.contentType();
+                if (contentType != null && contentType.subtype().contains("json")
                     && resultClass != InputStream.class) {
                     logger.logDebug("Response json");
                     return handleJsonResponse(in, responseHeaders, resultClass);
@@ -444,9 +442,9 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                     logger.logDebug("Response binary");
                     isBinaryStreamInput = true;
                     return (Result) handleBinaryStream(in);
-                } else if (body.contentType() != null && resultClass != InputStream.class &&
-                    body.contentType().type().contains("text") &&
-                    body.contentType().subtype().contains("plain")) {
+                } else if (contentType != null && resultClass != InputStream.class &&
+                    contentType.type().contains("text") &&
+                    contentType.subtype().contains("plain")) {
                     return handleRawResponse(in, resultClass);
                 } else {
                     return null;
@@ -459,7 +457,7 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
                     }catch(IOException e) {
                         logger.logError(e.getMessage(), e);
                     }
-                    if (response != null) response.close();
+                    response.close();
                 }
             }
         } catch (final GraphServiceException ex) {

From 27aec578b21a41d3022fb2e36a7d7c738ee6886c Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 10:48:32 -0500
Subject: [PATCH 201/213] - enables html report for tests spotbugs

---
 build.gradle | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build.gradle b/build.gradle
index b434b4018..e5853d161 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,6 +43,16 @@ spotbugsMain {
     }
 }
 
+spotbugsTest {
+    reports {
+        html {
+            enabled = true
+            destination = file("$buildDir/reports/spotbugs/test/spotbugs.html")
+            stylesheet = 'fancy-hist.xsl'
+        }
+    }
+}
+
 jacocoTestReport {
     reports {
         xml.enabled true

From b8c42363227c8a48e01d4b80f9a40996f4346490 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 14:26:47 -0500
Subject: [PATCH 202/213] - lints unit tests

---
 .../TokenCredentialAuthProviderTest.java      |  2 +-
 .../content/BatchResponseContentTest.java     | 40 +++++++++----------
 .../microsoft/graph/core/BaseClientTests.java | 15 ++++---
 .../graph/core/GraphServiceClientTest.java    |  5 ++-
 .../graph/http/BaseCollectionPageTests.java   |  2 +-
 .../http/BaseCollectionRequestTests.java      |  4 +-
 .../graph/http/BaseRequestBuilderTests.java   |  7 ++--
 .../graph/http/BaseRequestTests.java          | 12 +++---
 .../graph/http/BaseStreamRequestTests.java    |  2 +-
 .../http/GraphFatalServiceExceptionTests.java |  4 +-
 .../http/GraphServiceExceptionTests.java      |  4 +-
 .../graph/http/ReferenceRequestBodyTests.java |  2 +-
 .../graph/httpcore/RetryHandlerTest.java      |  6 +--
 13 files changed, 53 insertions(+), 52 deletions(-)

diff --git a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
index 339cf4ee5..6868eb01c 100644
--- a/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
+++ b/src/test/java/com/microsoft/graph/authentication/TokenCredentialAuthProviderTest.java
@@ -15,7 +15,7 @@
 
 public class TokenCredentialAuthProviderTest {
 
-    public final String testToken = "CredentialTestToken";
+    private static final String testToken = "CredentialTestToken";
 
     @Test
     public void providerAddsTokenOnValidHostName() throws MalformedURLException, InterruptedException,
diff --git a/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
index 27ae876e5..6414b7252 100644
--- a/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
+++ b/src/test/java/com/microsoft/graph/content/BatchResponseContentTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -9,7 +10,6 @@
 
 import java.io.IOException;
 import java.util.Iterator;
-import java.util.Map;
 
 import com.google.gson.JsonElement;
 import com.microsoft.graph.http.GraphErrorResponse;
@@ -20,13 +20,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import okhttp3.MediaType;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-
 public class BatchResponseContentTest {
     @Test
     public void testValidBatchResponseContent() {
@@ -102,20 +95,23 @@ public void deserializesErrorsProperly() {
         String responsebody = "{\"responses\":[{\"id\":\"1\",\"status\":400,\"headers\":{\"Cache-Control\":\"no-cache\",\"x-ms-resource-unit\":\"1\",\"Content-Type\":\"application/json\"},\"body\":{\"error\":{\"code\":\"Request_BadRequest\",\"message\":\"Avalueisrequiredforproperty'displayName'ofresource'User'.\",\"innerError\":{\"date\":\"2021-02-02T19:19:38\",\"request-id\":\"408b8e64-4047-4c97-95b6-46e9f212ab48\",\"client-request-id\":\"102910da-260c-3028-0fb3-7d6903a02622\"}}}}]}";
         ISerializer serializer = new DefaultSerializer(mock(ILogger.class));
         BatchResponseContent batchresponse = serializer.deserializeObject(responsebody, BatchResponseContent.class);
-        if(batchresponse != null && batchresponse.responses != null) // this is done by the batch request in the fluent API
-            for(final BatchResponseStep<?> step : batchresponse.responses) {
-                step.serializer = serializer;
+        if(batchresponse != null) {
+            if(batchresponse.responses != null)  // this is done by the batch request in the fluent API
+                for(final BatchResponseStep<?> step : batchresponse.responses) {
+                    step.serializer = serializer;
+                }
+            assertThrows(GraphServiceException.class, () -> {
+                batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
+            });
+            try {
+                batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
+            } catch(GraphServiceException ex) {
+                final GraphErrorResponse response = ex.getError();
+                assertNotNull(response);
+                assertNotNull(response.error);
+                assertNotNull(response.error.message);
             }
-        assertThrows(GraphServiceException.class, () -> {
-            final Object body = batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
-        });
-        try {
-            final Object body = batchresponse.getResponseById("1").getDeserializedBody(BatchRequestContent.class);
-        } catch(GraphServiceException ex) {
-            final GraphErrorResponse response = ex.getError();
-            assertNotNull(response);
-            assertNotNull(response.error);
-            assertNotNull(response.error.message);
-        }
+        } else
+            fail("batch response was null");
     }
 }
diff --git a/src/test/java/com/microsoft/graph/core/BaseClientTests.java b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
index a3fbfb52b..3d853e493 100644
--- a/src/test/java/com/microsoft/graph/core/BaseClientTests.java
+++ b/src/test/java/com/microsoft/graph/core/BaseClientTests.java
@@ -14,6 +14,7 @@
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
+import okhttp3.RequestBody;
 import okio.BufferedSink;
 import okio.Okio;
 
@@ -97,11 +98,15 @@ public void testCustomRequest() {
     }
     private String getStringFromRequestBody(Request request) {
         try {
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            final BufferedSink buffer = Okio.buffer(Okio.sink(out));
-            request.body().writeTo(buffer);
-            ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-            return CoreHttpProvider.streamToString(in);
+            try(final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+                final BufferedSink buffer = Okio.buffer(Okio.sink(out));
+                final RequestBody body = request.body();
+                if(body != null)
+                    body.writeTo(buffer);
+                try(final ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) {
+                    return CoreHttpProvider.streamToString(in);
+                }
+            }
         } catch (Exception ex) {
             ex.printStackTrace();
             return "";
diff --git a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
index c9a018374..14c211583 100644
--- a/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
+++ b/src/test/java/com/microsoft/graph/core/GraphServiceClientTest.java
@@ -10,6 +10,7 @@
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 
 import org.junit.jupiter.api.Test;
 
@@ -119,12 +120,12 @@ public ISerializer getSerializer() {
 
             @Override
             public <Result, BodyType> java.util.concurrent.CompletableFuture<Result> sendAsync(IHttpRequest request, Class<Result> resultClass, BodyType serializable) {
-                return null;
+                return CompletableFuture.completedFuture(null);
             }
 
             @Override
             public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFuture<Result> sendAsync(IHttpRequest request, Class<Result> resultClass, BodyType serializable, final IStatefulResponseHandler<Result, DeserializeType> handler) {
-                return null;
+                return CompletableFuture.completedFuture(null);
             }
 
             @Override
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
index 91693e427..d677327a6 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionPageTests.java
@@ -23,7 +23,7 @@
 public class BaseCollectionPageTests {
 
     private BaseRequestBuilder<String> mRequestBuilder;
-    private static ArrayList<String> list;
+    private ArrayList<String> list;
     private BaseCollectionPage<String, BaseRequestBuilder<String>> baseCollectionPage;
     private String requestUrl = "https://a.b.c/";
 
diff --git a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
index 7f01e21b4..7865618a9 100644
--- a/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseCollectionRequestTests.java
@@ -93,7 +93,7 @@ public void testSend() {
 
     @Test
     public void testPost() {
-        final ICollectionResponse<JsonObject> result = mRequest.post(null);
+        final ICollectionResponse<JsonObject> result = mRequest.post(new JsonObject());
         assertNotNull(result);
         assertEquals("zzz", result.values().get(0).get("id").getAsString());
     }
@@ -156,7 +156,7 @@ public void testGetMethod() {
     @Test
     public void testPostMethod() {
         assertNull(mRequest.getHttpMethod());
-        mRequest.post(null);
+        mRequest.post(new JsonObject());
         assertEquals(HttpMethod.POST, mRequest.getHttpMethod());
     }
 
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
index ea1ff68bf..c61caf5f2 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestBuilderTests.java
@@ -2,12 +2,13 @@
 
 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.core.IBaseClient;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import okhttp3.Request;
-
 /**
  * Test cases for {@see BaseRequestBuilder}
  */
@@ -18,7 +19,7 @@ public class BaseRequestBuilderTests {
 
     @BeforeEach
     public void setUp() throws Exception {
-        baseRequestBuilder = new BaseRequestBuilder<>(expectedRequestUrl,null,null){};
+        baseRequestBuilder = new BaseRequestBuilder<>(expectedRequestUrl, mock(IBaseClient.class), null){};
     }
 
     @Test
diff --git a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
index f1a25ba62..27c8d95c3 100644
--- a/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseRequestTests.java
@@ -75,7 +75,7 @@ public void testSendWithCallback() throws InterruptedException, ExecutionExcepti
     public void testFunctionParameters() {
         final Option fo1 = new FunctionOption("1", "one");
         final Option fo2 = new FunctionOption("2", null);
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(fo1, fo2), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(fo1, fo2), Void.class){};
         assertEquals("https://a.b.c/(1='one',2=null)", request.getRequestUrl().toString());
         request.addFunctionOption(new FunctionOption("3","two"));;
         assertEquals("https://a.b.c/(1='one',2=null,3='two')", request.getRequestUrl().toString());
@@ -86,7 +86,7 @@ public void testFunctionParameters() {
     public void testQueryParameters() {
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1, q2), Void.class){};
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         request.addQueryOption(new QueryOption("q3","option3"));
         assertEquals("https://a.b.c/?q1=option1%20&q2=option2&q3=option3", request.getRequestUrl().toString());
@@ -99,14 +99,14 @@ public void testFunctionAndQueryParameters() {
         final Option f2 = new FunctionOption("f2", null);
         final Option q1 = new QueryOption("q1","option1 ");
         final Option q2 = new QueryOption("q2","option2");
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(f1, f2, q1, q2), Void.class){};
         assertEquals("https://a.b.c/(f1='fun1',f2=null)?q1=option1%20&q2=option2", request.getRequestUrl().toString());
         assertEquals(4, request.getOptions().size());
     }
 
     @Test
     public void testHttpMethod() {
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, Void.class){};
         assertNull(request.getHttpMethod());
         request.setHttpMethod(HttpMethod.GET);
         assertEquals(HttpMethod.GET, request.getHttpMethod());
@@ -116,7 +116,7 @@ public void testHttpMethod() {
     public void testHeader() {
         final String expectedHeader = "header key";
         final String expectedValue = "header value";
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), null, Void.class){};
         assertEquals(0, request.getHeaders().size());
         request.addHeader(expectedHeader,expectedValue);
         assertEquals(1,request.getHeaders().size());
@@ -128,7 +128,7 @@ public void testProtectedProperties() {
         assertEquals(0, mRequest.queryOptions.size());
         final Option q1 = new QueryOption("q1","option1 ");
         final Option f1 = new FunctionOption("f1","option2");
-        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1,f1), null){};
+        final BaseRequest<Void> request = new BaseRequest<Void>("https://a.b.c/", mock(IBaseClient.class), Arrays.asList(q1,f1), Void.class){};
         assertEquals(1, request.functionOptions.size());
         assertEquals(1, request.queryOptions.size());
         assertEquals("q1", request.queryOptions.get(0).getName());
diff --git a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
index dbf528afd..bbbfd8f2c 100644
--- a/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
+++ b/src/test/java/com/microsoft/graph/http/BaseStreamRequestTests.java
@@ -60,7 +60,7 @@ public void testSend() throws IOException {
                 mock(ILogger.class),
                 mockClient);
         when(mBaseClient.getHttpProvider()).thenReturn(mProvider);
-        final BaseStreamRequest<String> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, null){};
+        final BaseStreamRequest<String> request = new BaseStreamRequest<>("https://a.b.c/", mBaseClient,null, String.class){};
         request.send();
     }
 
diff --git a/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
index 998f45569..682027503 100644
--- a/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphFatalServiceExceptionTests.java
@@ -10,9 +10,9 @@ public class GraphFatalServiceExceptionTests {
 
 	@Test
 	public void testGraphFatalServiceException() {
-        GraphFatalServiceException exception = new GraphFatalServiceException(null,null,new ArrayList<String>(),null,401,"Unauthenticated",new ArrayList<String>(),null, false);
+        GraphFatalServiceException exception = new GraphFatalServiceException("GET", "https://graph.microsoft.com/v1.0/me",new ArrayList<String>(),null,401,"Unauthenticated",new ArrayList<String>(),null, false);
         String expectedMessage = "Unexpected exception returned from the service." +
-                "null null\n" +
+                "GET https://graph.microsoft.com/v1.0/me\n" +
                 "\n" +
                 "\n" +
                 "401 : Unauthenticated\n" +
diff --git a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
index d092010b6..b2f577843 100644
--- a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
@@ -31,7 +31,7 @@ public void testError() {
         GraphError error = new GraphError();
         error.code = GraphErrorCodes.UNAUTHENTICATED.toString();
         errorResponse.error = error;
-        GraphServiceException exception = new GraphServiceException(null,null,new ArrayList<String>(),null,401,"Unauthorized",new ArrayList<String>(),errorResponse, false);
+        GraphServiceException exception = new GraphServiceException("GET","https://graph.microsoft.com/v1.0/me",new ArrayList<String>(),null,401,"Unauthorized",new ArrayList<String>(),errorResponse, false);
         String message = exception.getMessage();
         assertTrue(message.indexOf("Error code: UNAUTHENTICATED") == 0);
         assertTrue(message.indexOf("401 : Unauthorized") > 0);
@@ -45,7 +45,7 @@ public void testVerboseError() {
         GraphError error = new GraphError();
         error.code = GraphErrorCodes.UNAUTHENTICATED.toString();
         errorResponse.error = error;
-        GraphServiceException exception = new GraphServiceException(null,null,new ArrayList<String>(),null,401,"Unauthorized",new ArrayList<String>(),errorResponse, true);
+        GraphServiceException exception = new GraphServiceException("GET","https://graph.microsoft.com/v1.0/me",new ArrayList<String>(),null,401,"Unauthorized",new ArrayList<String>(),errorResponse, true);
         String message = exception.getMessage();
         assertTrue(message.indexOf("Error code: UNAUTHENTICATED") == 0);
         assertTrue(message.indexOf("401 : Unauthorized") > 0);
diff --git a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
index 124b3e209..cfd1ada8f 100644
--- a/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
+++ b/src/test/java/com/microsoft/graph/http/ReferenceRequestBodyTests.java
@@ -11,7 +11,7 @@ public class ReferenceRequestBodyTests {
 
 	@Test
 	public void testRawObject() {
-        ReferenceRequestBody body = new ReferenceRequestBody(null);
+        ReferenceRequestBody body = new ReferenceRequestBody("");
         ISerializer serializer = mock(ISerializer.class);
         JsonObject jsonObject = new JsonObject();
         body.setRawObject(serializer,jsonObject);
diff --git a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
index 688d4812e..466d2572c 100644
--- a/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
+++ b/src/test/java/com/microsoft/graph/httpcore/RetryHandlerTest.java
@@ -21,10 +21,8 @@
 
 public class RetryHandlerTest {
 
-    int maxRetries = 2;
-    int retryInterval = 1000;
-    String testmeurl = "https://graph.microsoft.com/v1.0/me";
-    private final int HTTP_SERVER_ERROR = 500;
+    private static final String testmeurl = "https://graph.microsoft.com/v1.0/me";
+    private static final int HTTP_SERVER_ERROR = 500;
 
     @Test
     public void testRetryHandlerCreation() {

From 752e808dfcb31e72114fd6fa217f556efcb08481 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 14:40:51 -0500
Subject: [PATCH 203/213] - adds spotbugs exclusions

---
 build.gradle              |  2 ++
 spotBugsExcludeFilter.xml | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 spotBugsExcludeFilter.xml

diff --git a/build.gradle b/build.gradle
index e5853d161..923ea3704 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,7 @@ jacoco {
 }
 
 spotbugsMain {
+    excludeFilter = file("spotBugsExcludeFilter.xml")
     reports {
         html {
             enabled = true
@@ -44,6 +45,7 @@ spotbugsMain {
 }
 
 spotbugsTest {
+    excludeFilter = file("spotBugsExcludeFilter.xml")
     reports {
         html {
             enabled = true
diff --git a/spotBugsExcludeFilter.xml b/spotBugsExcludeFilter.xml
new file mode 100644
index 000000000..31e4a5f86
--- /dev/null
+++ b/spotBugsExcludeFilter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<FindBugsFilter
+xmlns="https://github.com/spotbugs/filter/3.0.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubusercontent.com/spotbugs/spotbugs/3.1.0/spotbugs/etc/findbugsfilter.xsd">
+	<Match>
+		<Class name="com.microsoft.graph.authentication.BaseAuthenticationProviderTest" />
+		<Method name="providerDoesNotAddTokenOnNullUrls" />
+		<Bug code="NP" />
+	</Match>
+	<Match>
+		<Class name="com.microsoft.graph.concurrency.ChunkedUploadRequest" />
+		<Bug code="Dm" />
+	</Match>
+	<Match>
+		<Class name="com.microsoft.graph.concurrency.ChunkedUploadResponseHandler" />
+		<Method name="generateResult" />
+		<Bug code="RCN,NP" />
+	</Match>
+</FindBugsFilter>
\ No newline at end of file

From ab2ff3093be70001cb355048839fbc863ffc8f7f Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 15 Feb 2021 16:09:11 -0500
Subject: [PATCH 204/213] - adds missing defensive programming for nonnull
 annotations

---
 .../concurrency/ChunkedUploadProvider.java    | 17 ++-------
 .../concurrency/ChunkedUploadRequest.java     |  5 +++
 .../ChunkedUploadResponseHandler.java         |  9 ++++-
 .../concurrency/ChunkedUploadResult.java      |  8 +++-
 .../microsoft/graph/content/BatchRequest.java |  6 +--
 .../com/microsoft/graph/core/BaseClient.java  | 37 +++++++------------
 .../graph/core/CustomRequestBuilder.java      |  3 +-
 .../com/microsoft/graph/core/DateOnly.java    |  2 +
 .../com/microsoft/graph/core/Multipart.java   |  5 ++-
 .../com/microsoft/graph/core/TimeOfDay.java   |  2 +
 .../graph/http/BaseCollectionRequest.java     | 29 +++++++++++----
 .../http/BaseCollectionRequestBuilder.java    |  6 ++-
 .../graph/http/BaseCollectionResponse.java    |  5 +++
 ...ollectionWithReferencesRequestBuilder.java |  3 +-
 .../http/BaseDeltaCollectionRequest.java      | 12 +++---
 .../http/BaseEntityCollectionRequest.java     |  2 +-
 .../http/BaseReferenceRequestBuilder.java     |  3 +-
 .../com/microsoft/graph/http/BaseRequest.java | 32 +++++++++++-----
 .../graph/http/BaseRequestBuilder.java        |  7 +++-
 .../graph/http/BaseStreamRequest.java         | 11 +++++-
 .../graph/http/BaseWithReferenceRequest.java  |  9 ++++-
 .../http/BaseWithReferenceRequestBuilder.java |  5 ++-
 .../graph/http/CoreHttpProvider.java          | 11 ++++++
 .../microsoft/graph/http/CustomRequest.java   | 10 +++++
 .../com/microsoft/graph/http/GraphError.java  |  5 +++
 .../graph/http/GraphErrorResponse.java        |  7 +++-
 .../graph/http/GraphServiceException.java     | 16 +++++---
 .../graph/http/PrimitiveRequestBuilder.java   |  5 ++-
 .../graph/http/ReferenceRequestBody.java      |  5 ++-
 .../microsoft/graph/httpcore/HttpClients.java |  2 +
 .../middlewareoption/TelemetryOptions.java    |  3 +-
 .../microsoft/graph/logger/DefaultLogger.java | 24 +++++++-----
 .../graph/serializer/ByteArraySerializer.java | 11 ++++--
 .../serializer/CollectionPageSerializer.java  |  2 +
 .../graph/serializer/DefaultSerializer.java   | 17 ++++++---
 .../graph/serializer/EnumSetSerializer.java   | 11 ++++--
 .../FallbackTypeAdapterFactory.java           | 25 +++++++------
 .../serializer/OffsetDateTimeSerializer.java  |  3 ++
 .../graph/http/GraphErrorResponseTests.java   |  4 +-
 39 files changed, 253 insertions(+), 126 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
index 8e9ce8f33..ce0c61989 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
@@ -30,6 +30,7 @@
 import java.io.InputStream;
 import java.security.InvalidParameterException;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -103,25 +104,15 @@ public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
                                  @Nonnull final InputStream inputStream,
                                  final long streamSize,
                                  @Nonnull final Class<UploadType> uploadTypeClass) {
-        if (uploadSession == null) {
-            throw new InvalidParameterException("Upload session is null.");
-        }
-
-        if (client == null) {
-            throw new InvalidParameterException("OneDrive client is null.");
-        }
-
-        if (inputStream == null) {
-            throw new InvalidParameterException("Input stream is null.");
-        }
+        Objects.requireNonNull(uploadSession, "Upload session is null.");
 
         if (streamSize <= 0) {
             throw new InvalidParameterException("Stream size should larger than 0.");
         }
 
-        this.client = client;
+        this.client = Objects.requireNonNull(client, "Graph client is null.");
         this.readSoFar = 0;
-        this.inputStream = inputStream;
+        this.inputStream = Objects.requireNonNull(inputStream, "Input stream is null.");
         this.streamSize = streamSize;
         this.uploadUrl = uploadSession.getUploadUrl();
         this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass, uploadSession.getClass());
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
index 3d4a99d23..1ac59126c 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -6,6 +6,7 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -61,6 +62,9 @@ protected ChunkedUploadRequest(@Nonnull final String requestUrl,
                                 final int chunkSize,
                                 final long beginIndex,
                                 final long totalLength) {
+        Objects.requireNonNull(requestUrl, "parameter requestUrl cannot be null");
+        Objects.requireNonNull(client, "parameter client cannot be null");
+        Objects.requireNonNull(chunk, "parameter chunk cannot be null");
         this.data = new byte[chunkSize];
         System.arraycopy(chunk, 0, this.data, 0, chunkSize);
         this.baseRequest = new BaseRequest<ChunkedUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends ChunkedUploadResult<UploadType>>)(new ChunkedUploadResult<>((UploadType)null)).getClass()) {
@@ -84,6 +88,7 @@ protected ChunkedUploadRequest(@Nonnull final String requestUrl,
     @Nonnull
     public ChunkedUploadResult<UploadType> upload(
             @Nonnull final ChunkedUploadResponseHandler<UploadType> responseHandler) {
+        Objects.requireNonNull(responseHandler, "parameter responseHandler cannot be null");
         ChunkedUploadResult<UploadType> result = null;
 
         try {
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
index 272d341da..c571407a0 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
@@ -35,6 +35,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -65,8 +66,8 @@ public class ChunkedUploadResponseHandler<UploadType>
      * @param uploadSessionType the type of the upload session
 	 */
 	protected ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType, @Nonnull final Class<? extends IUploadSession>  uploadSessionType) {
-        this.deserializeTypeClass = uploadType;
-        this.uploadSessionClass = uploadSessionType;
+        this.deserializeTypeClass = Objects.requireNonNull(uploadType, "parameter uploadType cannot be null");
+        this.uploadSessionClass = Objects.requireNonNull(uploadSessionType, "parameter uploadSessionType cannot be null");
 	}
 
 	/**
@@ -96,6 +97,10 @@ public ChunkedUploadResult<UploadType> generateResult(
 			@Nonnull final Response response,
 			@Nonnull final ISerializer serializer,
 			@Nonnull final ILogger logger) throws Exception {
+        Objects.requireNonNull(request, "parameter request cannot be null");
+        Objects.requireNonNull(response, "parameter response cannot be null");
+        Objects.requireNonNull(serializer, "parameter serializer cannot be null");
+        Objects.requireNonNull(logger, "parameter logger cannot be null");
 		if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
 			logger.logDebug("Receiving error during upload, see detail on result error");
 
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
index 81a5e1c72..7894bb55c 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
@@ -8,6 +8,9 @@
 import com.microsoft.graph.http.GraphServiceException;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -68,7 +71,10 @@ protected ChunkedUploadResult(@Nullable final ClientException error) {
      * @param exception The exception received from server.
      */
     protected ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
-        this(new ClientException(exception.getMessage(/* verbose */ true), exception));
+        this(new ClientException(Objects
+                                .requireNonNull(exception, "parameter exception cannot be null")
+                                .getMessage(/* verbose */ true),
+                                exception));
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/content/BatchRequest.java b/src/main/java/com/microsoft/graph/content/BatchRequest.java
index ce65cdb42..ae7b732c4 100644
--- a/src/main/java/com/microsoft/graph/content/BatchRequest.java
+++ b/src/main/java/com/microsoft/graph/content/BatchRequest.java
@@ -43,7 +43,7 @@ public class BatchRequest extends BaseRequest<BatchResponseContent> {
      * @param client the client to use to execute the request
      * @param options the options to apply to the request
      */
-    public BatchRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient client, @Nonnull final List<? extends Option> options) {
+    public BatchRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nonnull final List<? extends Option> options) {
         super(requestUrl, client, options, BatchResponseContent.class);
     }
 
@@ -55,7 +55,7 @@ public BatchRequest(@Nonnull final String requestUrl, @Nonnull final IBaseClient
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable
-    public BatchResponseContent post(@Nonnull final BatchRequestContent content) throws ClientException {
+    public BatchResponseContent post(@Nullable final BatchRequestContent content) throws ClientException {
         this.setHttpMethod(HttpMethod.POST);
         final BatchResponseContent response = this.getClient().getHttpProvider().send(this, BatchResponseContent.class, content);
         setSerializerOnSteps(response);
@@ -69,7 +69,7 @@ public BatchResponseContent post(@Nonnull final BatchRequestContent content) thr
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable
-    public java.util.concurrent.CompletableFuture<BatchResponseContent> postAsync(@Nonnull final BatchRequestContent content) throws ClientException {
+    public java.util.concurrent.CompletableFuture<BatchResponseContent> postAsync(@Nullable final BatchRequestContent content) throws ClientException {
         this.setHttpMethod(HttpMethod.POST);
         return this.getClient().getHttpProvider().sendAsync(this, BatchResponseContent.class, content).thenApply(response -> {
             setSerializerOnSteps(response);
diff --git a/src/main/java/com/microsoft/graph/core/BaseClient.java b/src/main/java/com/microsoft/graph/core/BaseClient.java
index 6a94a3c66..cc0a2e333 100644
--- a/src/main/java/com/microsoft/graph/core/BaseClient.java
+++ b/src/main/java/com/microsoft/graph/core/BaseClient.java
@@ -75,7 +75,7 @@ public String getServiceRoot() {
 
     @Override
     public void setServiceRoot(@Nonnull final String value) {
-        endpoint = value;
+        endpoint = Objects.requireNonNull(value, "value parameter cannot be null");
     }
 
 	/**
@@ -89,7 +89,9 @@ public void setServiceRoot(@Nonnull final String value) {
 	 */
 	@Nonnull
 	public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Nonnull final Class<T> responseType) {
-		return new CustomRequestBuilder<>(getServiceRoot() + url, this, null, responseType);
+		Objects.requireNonNull(url, "url parameter cannot be null");
+        Objects.requireNonNull(responseType, "responseType parameter cannot be null");
+        return new CustomRequestBuilder<>(getServiceRoot() + url, this, null, responseType);
 	}
 
 	/**
@@ -101,8 +103,7 @@ public <T> CustomRequestBuilder<T> customRequest(@Nonnull final String url, @Non
 	 */
 	@Nonnull
 	public CustomRequestBuilder<JsonElement> customRequest(@Nonnull final String url) {
-		return new CustomRequestBuilder<>(getServiceRoot() + url, this, null,
-				JsonElement.class);
+		return this.customRequest(url, JsonElement.class);
     }
 
     /**
@@ -197,7 +198,7 @@ private IHttpProvider<nativeRequestType> getHttpProvider() {
 		 */
 		@Nonnull
 		public Builder<httpClientType, nativeRequestType> serializer(@Nonnull final ISerializer serializer) {
-			checkNotNull(serializer, "serializer");
+			Objects.requireNonNull(serializer, "parameter serializer cannot be null");
 			this.serializer = serializer;
 			return this;
 		}
@@ -211,7 +212,7 @@ public Builder<httpClientType, nativeRequestType> serializer(@Nonnull final ISer
 		 */
 		@Nonnull
 		public Builder<httpClientType, nativeRequestType> httpProvider(@Nonnull final IHttpProvider<nativeRequestType> httpProvider) {
-			checkNotNull(httpProvider, "httpProvider");
+			Objects.requireNonNull(httpProvider, "parameter httpProvider cannot be null");
 			this.httpProvider = httpProvider;
 			return this;
 		}
@@ -225,7 +226,7 @@ public Builder<httpClientType, nativeRequestType> httpProvider(@Nonnull final IH
 		 */
 		@Nonnull
 		public Builder<httpClientType, nativeRequestType> logger(@Nonnull final ILogger logger) {
-			checkNotNull(logger, "logger");
+			Objects.requireNonNull(logger, "parameter logger cannot be null");
 			this.logger = logger;
 			return this;
 		}
@@ -239,7 +240,7 @@ public Builder<httpClientType, nativeRequestType> logger(@Nonnull final ILogger
 		 */
 		@Nonnull
 		public Builder<httpClientType, nativeRequestType> httpClient(@Nonnull final httpClientType client) {
-			checkNotNull(client, "client");
+			Objects.requireNonNull(client, "parameter client cannot be null");
 			this.httpClient = client;
 			return this;
 		}
@@ -252,7 +253,7 @@ public Builder<httpClientType, nativeRequestType> httpClient(@Nonnull final http
 		 */
 		@Nonnull
 		public Builder<httpClientType, nativeRequestType> authenticationProvider(@Nonnull final IAuthenticationProvider auth) {
-			checkNotNull(auth, "auth");
+			Objects.requireNonNull(auth, "parameter auth cannot be null");
 			this.auth = auth;
 			return this;
 		}
@@ -288,18 +289,6 @@ public IBaseClient<nativeRequestType> buildClient() throws ClientException {
 		}
 	}
 
-	/**
-	 * Checks whether the provided object is null or not and throws an exception if it is
-	 *
-	 * @param o object to check
-	 * @param name name to use in the exception message
-	 */
-	protected static void checkNotNull(@Nullable final Object o, @Nonnull final String name) {
-		if (o==null) {
-			throw new NullPointerException(name + " cannot be null");
-		}
-    }
-
     /**
      * The HTTP provider instance
      */
@@ -353,7 +342,7 @@ public ISerializer getSerializer() {
      * @param logger The logger
      */
     protected void setLogger(@Nonnull final ILogger logger) {
-        checkNotNull(logger, "logger");
+        Objects.requireNonNull(logger, "parameter logger cannot be null");
         this.logger = logger;
     }
 
@@ -363,7 +352,7 @@ protected void setLogger(@Nonnull final ILogger logger) {
      * @param httpProvider The HTTP provider
      */
     protected void setHttpProvider(@Nonnull final IHttpProvider<nativeRequestType> httpProvider) {
-        checkNotNull(httpProvider, "httpProvider");
+        Objects.requireNonNull(httpProvider, "parameter httpProvider cannot be null");
         this.httpProvider = httpProvider;
     }
 
@@ -373,7 +362,7 @@ protected void setHttpProvider(@Nonnull final IHttpProvider<nativeRequestType> h
      * @param serializer The serializer
      */
     public void setSerializer(@Nonnull final ISerializer serializer) {
-        checkNotNull(serializer, "serializer");
+        Objects.requireNonNull(serializer, "parameter serializer cannot be null");
         this.serializer = serializer;
     }
 
diff --git a/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java b/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
index 6354965b6..5915eb32b 100644
--- a/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/core/CustomRequestBuilder.java
@@ -1,6 +1,7 @@
 package com.microsoft.graph.core;
 
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -28,7 +29,7 @@ public class CustomRequestBuilder<T> extends BaseRequestBuilder<T> {
 	 */
 	public CustomRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final List<? extends Option> requestOptions, @Nonnull final Class<T> responseType) {
 		super(requestUrl, client, requestOptions);
-		this.responseType = responseType;
+		this.responseType = Objects.requireNonNull(responseType, "parameter responseType cannot be null");
 	}
 
 	/**
diff --git a/src/main/java/com/microsoft/graph/core/DateOnly.java b/src/main/java/com/microsoft/graph/core/DateOnly.java
index 76ee7b722..e5a805092 100644
--- a/src/main/java/com/microsoft/graph/core/DateOnly.java
+++ b/src/main/java/com/microsoft/graph/core/DateOnly.java
@@ -3,6 +3,7 @@
 
 import java.text.ParseException;
 import java.util.Locale;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -36,6 +37,7 @@ public class DateOnly {
      */
     @Nullable
     public static DateOnly parse(@Nonnull final String dateStr) throws ParseException {
+        Objects.requireNonNull(dateStr, "parameter dateStr cannot be null");
         // break the date up into its constituent parts
         final String[] dateInfo = dateStr.split("-");
 
diff --git a/src/main/java/com/microsoft/graph/core/Multipart.java b/src/main/java/com/microsoft/graph/core/Multipart.java
index 365be77e9..0600cac80 100644
--- a/src/main/java/com/microsoft/graph/core/Multipart.java
+++ b/src/main/java/com/microsoft/graph/core/Multipart.java
@@ -7,6 +7,7 @@
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -51,7 +52,7 @@ public String getBoundary() {
 	 * @param boundary The multipart boundary
 	 */
 	public void setBoundary(@Nonnull final String boundary) {
-		this.boundary = boundary;
+		this.boundary = Objects.requireNonNull(boundary, "parameter boundary cannot be null");
 	}
 
 	/**
@@ -68,7 +69,7 @@ public String getContentType() {
 	 * @param contentType The multipart Content-Type
 	 */
 	public void setContentType(@Nonnull final String contentType) {
-		this.contentType = contentType;
+		this.contentType = Objects.requireNonNull(contentType, "parameter contentType cannot be null");
 	}
 
 	/**
diff --git a/src/main/java/com/microsoft/graph/core/TimeOfDay.java b/src/main/java/com/microsoft/graph/core/TimeOfDay.java
index a49cb71d5..bc87efe02 100644
--- a/src/main/java/com/microsoft/graph/core/TimeOfDay.java
+++ b/src/main/java/com/microsoft/graph/core/TimeOfDay.java
@@ -7,6 +7,7 @@
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * The time of day
@@ -37,6 +38,7 @@ public class TimeOfDay {
      */
     @Nullable
     public static TimeOfDay parse(@Nonnull final String timeStr) throws ParseException {
+        Objects.requireNonNull(timeStr, "parameter timeStr cannot be null");
         // break the date up into its constituent parts
         final String[] timeInfo = timeStr.split(":");
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index 944b3c436..c148ef198 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -26,6 +26,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
@@ -82,9 +84,9 @@ public BaseCollectionRequest(@Nonnull final String requestUrl,
                                  @Nonnull final Class<T2> responseCollectionClass,
                                  @Nonnull final Class<T3> collectionPageClass,
                                  @Nonnull final Class<? extends BaseCollectionRequestBuilder<T, ? extends BaseRequestBuilder<T>, T2, T3, ? extends BaseCollectionRequest<T, T2, T3>>> collectionRequestBuilderClass) {
-        this.responseCollectionClass = responseCollectionClass;
-        this.collectionPageClass = collectionPageClass;
-        this.collRequestBuilderClass = collectionRequestBuilderClass;
+        this.responseCollectionClass = Objects.requireNonNull(responseCollectionClass, "parameter responseCollectionClass cannot be null");
+        this.collectionPageClass = Objects.requireNonNull(collectionPageClass, "parameter collectionPageClass cannot be null");
+        this.collRequestBuilderClass = Objects.requireNonNull(collectionRequestBuilderClass, "parameter collectionRequestBuilderClass cannot be null");
         baseRequest = new BaseRequest<T2>(requestUrl, client, options, responseCollectionClass) {};
     }
 
@@ -119,6 +121,7 @@ protected java.util.concurrent.CompletableFuture<T2> sendAsync() throws ClientEx
      */
     @Nullable
     public T3 buildFromResponse(@Nonnull final T2 response) {
+        Objects.requireNonNull(response, "parameter response cannot be null");
         try {
             final Object builder = response.nextLink() == null ? null : this.collRequestBuilderClass
                     .getConstructor(String.class, IBaseClient.class, java.util.List.class)
@@ -170,7 +173,8 @@ public List<HeaderOption> getHeaders() {
      * @param value  the value of the header
      */
     @Override
-    public void addHeader(@Nonnull final String header, @Nonnull final String value) {
+    public void addHeader(@Nonnull final String header, @Nullable final String value) {
+        Objects.requireNonNull(header, "parameter header cannot be null");
         baseRequest.addHeader(header, value);
     }
 
@@ -210,6 +214,7 @@ public List<Option> getOptions() {
      * @param option the query option to add
      */
     public void addQueryOption(@Nonnull final QueryOption option) {
+        Objects.requireNonNull(option, "parameter option cannot be null");
         baseRequest.getQueryOptions().add(option);
     }
 
@@ -219,6 +224,7 @@ public void addQueryOption(@Nonnull final QueryOption option) {
      * @param value the expand clause
      */
     protected void addExpandOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$expand", value));
     }
 
@@ -228,6 +234,7 @@ protected void addExpandOption(@Nonnull final String value) {
      * @param value the filter clause
      */
     protected void addFilterOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$filter", value));
     }
 
@@ -237,6 +244,7 @@ protected void addFilterOption(@Nonnull final String value) {
      * @param value the order by clause
      */
     protected void addOrderByOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$orderby", value));
     }
 
@@ -246,6 +254,7 @@ protected void addOrderByOption(@Nonnull final String value) {
      * @param value the select clause
      */
     protected void addSelectOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$select", value));
     }
 
@@ -273,7 +282,8 @@ protected void addSkipOption(final int value) {
      * @param skipToken - Token for pagination
      */
     protected void addSkipTokenOption(@Nonnull final String skipToken) {
-    	addQueryOption(new QueryOption("$skiptoken", skipToken));
+    	Objects.requireNonNull(skipToken, "parameter skipToken cannot be null");
+        addQueryOption(new QueryOption("$skiptoken", skipToken));
     }
 
     /**
@@ -290,6 +300,7 @@ protected void addCountOption(final boolean value) {
      * @param option the query option to add
      */
     public void addFunctionOption(@Nonnull final FunctionOption option) {
+        Objects.requireNonNull(option, "parameter option cannot be null");
         baseRequest.getFunctionOptions().add(option);
     }
 
@@ -337,7 +348,8 @@ public int getMaxRedirects() {
      * @param shouldRedirect Callback called before doing a redirect
      */
     public void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect) {
-    	baseRequest.setShouldRedirect(shouldRedirect);
+    	Objects.requireNonNull(shouldRedirect, "parameter shouldRedirect cannot be null");
+        baseRequest.setShouldRedirect(shouldRedirect);
     }
 
     /**
@@ -356,7 +368,8 @@ public IShouldRedirect getShouldRedirect() {
      * @param shouldretry The callback called before retry
      */
     public void setShouldRetry(@Nonnull IShouldRetry shouldretry) {
-    	baseRequest.setShouldRetry(shouldretry);
+    	Objects.requireNonNull(shouldretry, "parameter shouldretry cannot be null");
+        baseRequest.setShouldRetry(shouldretry);
     }
 
     /**
@@ -413,6 +426,7 @@ public long getDelay() {
      */
     @Nullable
     public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        Objects.requireNonNull(httpMethod, "parameter httpMethod cannot be null");
         baseRequest.setHttpMethod(httpMethod);
         return this;
     }
@@ -428,6 +442,7 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
     @Override
     @Nullable
     public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+        Objects.requireNonNull(serializedObject, "parameter serializedObject cannot be null");
         return baseRequest.getHttpRequest(serializedObject);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
index f2c0f1b02..977fc8255 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequestBuilder.java
@@ -4,6 +4,7 @@
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -35,8 +36,8 @@ public BaseCollectionRequestBuilder(@Nonnull final String requestUrl, @Nonnull f
                                         @Nonnull final Class<T2> requestBuilderClass,
 										@Nonnull final Class<T5> collectionRequestClass) {
         super(requestUrl, client, requestOptions);
-		this.collRequestClass = collectionRequestClass;
-        this.reqBuilderClass = requestBuilderClass;
+		this.collRequestClass = Objects.requireNonNull(collectionRequestClass, "parameter collectionRequestClass cannot be null");
+        this.reqBuilderClass = Objects.requireNonNull(requestBuilderClass, "parameter requestBuilderClass cannot be null");
     }
 
     /**
@@ -74,6 +75,7 @@ public T5 buildRequest(@Nullable final java.util.List<? extends com.microsoft.gr
      */
     @Nullable
     public T2 byId(@Nonnull final String id) {
+        Objects.requireNonNull(id, "parameter id cannot be null");
         try {
             return reqBuilderClass.getConstructor(String.class, IBaseClient.class, java.util.List.class)
                                 .newInstance(getRequestUrlWithAdditionalSegment(id), getClient(), getOptions());
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
index c5012972a..bf31f533a 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionResponse.java
@@ -6,6 +6,9 @@
 import com.google.gson.annotations.Expose;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.serializer.IJsonBackedObject;
@@ -64,6 +67,8 @@ public final AdditionalDataManager additionalDataManager() {
      * @param json the JSON object to set this object to
      */
     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++) {
diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
index b6e0fe1df..9294246ac 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionWithReferencesRequestBuilder.java
@@ -26,6 +26,7 @@
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -56,7 +57,7 @@ public BaseCollectionWithReferencesRequestBuilder(@Nonnull final String requestU
                                                     @Nonnull final Class<T7> collectionWithReferencesRequestClass,
                                                     @Nonnull final Class<T8> collectionWithReferenceRequestBuilderClass) {
         super(requestUrl, client, requestOptions, referenceRequestBuilderClass, collectionWithReferencesRequestClass);
-        this.collWithRefRequestBuilderClass = collectionWithReferenceRequestBuilderClass;
+        this.collWithRefRequestBuilderClass = Objects.requireNonNull(collectionWithReferenceRequestBuilderClass, "parameter collectionWithReferenceRequestBuilderClass cannot be null");
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
index 0d959e300..96f6e964d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
@@ -23,6 +23,7 @@
 package com.microsoft.graph.http;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -69,6 +70,8 @@ public BaseDeltaCollectionRequest(@Nonnull final String requestUrl,
      * @param optionKey - the key to use for the query string parameter
      */
     protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final String optionKey) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
+        Objects.requireNonNull(optionKey, "parameter optionKey cannot be null");
         addQueryOption(new QueryOption(optionKey, value));
     }
 
@@ -86,11 +89,10 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S
      */
     @Nonnull
     protected String getDeltaTokenFromLink(@Nonnull final String deltaLink) {
-        if(deltaLink != null) {
-            final Matcher matcher = pattern.matcher(deltaLink);
-            if(matcher.matches()) {
-                return matcher.group(1);
-            }
+        Objects.requireNonNull(deltaLink, "parameter deltaLink cannot be null");
+        final Matcher matcher = pattern.matcher(deltaLink);
+        if(matcher.matches()) {
+            return matcher.group(1);
         }
         return  "";
     }
diff --git a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
index fd937b64d..dd725b40b 100644
--- a/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseEntityCollectionRequest.java
@@ -86,7 +86,7 @@ public T3 get() throws ClientException {
      * @throws ClientException an exception occurs if there was an error while the request was sent
      */
     @Nullable
-    protected <BodyType> T2 post(@Nonnull final BodyType serializedObject) throws ClientException {
+    protected <BodyType> T2 post(@Nullable final BodyType serializedObject) throws ClientException {
         getBaseRequest().setHttpMethod(HttpMethod.POST);
         return getBaseRequest().getClient().getHttpProvider().send(this, responseCollectionClass, serializedObject);
     }
diff --git a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
index b5f49f938..0f584c462 100644
--- a/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseReferenceRequestBuilder.java
@@ -26,6 +26,7 @@
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -47,7 +48,7 @@ public abstract class BaseReferenceRequestBuilder<T, T2 extends BaseReferenceReq
      */
     public BaseReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T2> referenceRequestClass) {
         super(requestUrl, client, requestOptions);
-        this.refRequestClass = referenceRequestClass;
+        this.refRequestClass = Objects.requireNonNull(referenceRequestClass, "parameter referenceRequestClass cannot be null");
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequest.java b/src/main/java/com/microsoft/graph/http/BaseRequest.java
index c0d76746d..436d7173d 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequest.java
@@ -42,6 +42,7 @@
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -140,9 +141,9 @@ public BaseRequest(@Nonnull final String requestUrl,
                        @Nonnull final IBaseClient<?> client,
                        @Nullable final List<? extends Option> options,
                        @Nonnull final Class<? extends T> responseClass) {
-        this.requestUrl = requestUrl;
-        this.client = client;
-        this.responseClass = responseClass;
+        this.requestUrl = Objects.requireNonNull(requestUrl, "parameter requestUrl cannot be null");
+        this.client = Objects.requireNonNull(client, "parameter client cannot be null");
+        this.responseClass = Objects.requireNonNull(responseClass, "parameter responseClass cannot be null");
 
         headersOptions = new ArrayList<>();
         queryOptions = new ArrayList<>();
@@ -211,7 +212,7 @@ public URL getRequestUrl() {
     @Override
     @Nullable
     @SuppressWarnings("unchecked")
-    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nullable final requestBodyType serializedObject) throws ClientException {
         return (nativeRequestType)client.getHttpProvider().getHttpRequest(this, (Class<responseType>) responseClass, serializedObject);
     }
 
@@ -274,7 +275,8 @@ public List<HeaderOption> getHeaders() {
      * @param value  the value of the header
      */
     @Override
-    public void addHeader(@Nonnull final String header, @Nonnull final String value) {
+    public void addHeader(@Nonnull final String header, @Nullable final String value) {
+        Objects.requireNonNull(header, "parameter header cannot be null");
         headersOptions.add(new HeaderOption(header, value));
     }
 
@@ -310,7 +312,7 @@ public boolean getUseCaches() {
     @SuppressWarnings("unchecked")
     protected <T1> java.util.concurrent.CompletableFuture<T> sendAsync(@Nonnull final HttpMethod method,
                                  @Nullable final T1 serializedObject) {
-        this.method = method;
+        this.method = Objects.requireNonNull(method, "parameter method cannot be null");
         return (java.util.concurrent.CompletableFuture<T>) client.getHttpProvider().sendAsync(this, responseClass, serializedObject);
     }
 
@@ -370,6 +372,7 @@ public List<Option> getOptions() {
      * @param option the query option to add
      */
     public void addQueryOption(@Nonnull final QueryOption option) {
+        Objects.requireNonNull(option, "parameter option cannot be null");
         getQueryOptions().add(option);
     }
 
@@ -379,6 +382,7 @@ public void addQueryOption(@Nonnull final QueryOption option) {
      * @param option the function option to add
      */
     public void addFunctionOption(@Nonnull final FunctionOption option) {
+        Objects.requireNonNull(option, "parameter option cannot be null");
         getFunctionOptions().add(option);
     }
 
@@ -388,6 +392,7 @@ public void addFunctionOption(@Nonnull final FunctionOption option) {
      * @param value the expand clause
      */
     protected void addExpandOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$expand", value));
     }
 
@@ -397,6 +402,7 @@ protected void addExpandOption(@Nonnull final String value) {
      * @param value the filter clause
      */
     protected void addFilterOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$filter", value));
     }
 
@@ -406,6 +412,7 @@ protected void addFilterOption(@Nonnull final String value) {
      * @param value the order by clause
      */
     protected void addOrderByOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$orderby", value));
     }
 
@@ -415,6 +422,7 @@ protected void addOrderByOption(@Nonnull final String value) {
      * @param value the select clause
      */
     protected void addSelectOption(@Nonnull final String value) {
+        Objects.requireNonNull(value, "parameter value cannot be null");
         addQueryOption(new QueryOption("$select", value));
     }
 
@@ -442,7 +450,8 @@ protected void addSkipOption(final int value) {
      * @param skipToken - Token for pagination
      */
     protected void addSkipTokenOption(@Nonnull final String skipToken) {
-    	addQueryOption(new QueryOption("$skiptoken", skipToken));
+    	Objects.requireNonNull(skipToken, "parameter skipToken cannot be null");
+        addQueryOption(new QueryOption("$skiptoken", skipToken));
     }
 
     /**
@@ -459,6 +468,7 @@ protected void addCountOption(final boolean value) {
      * @param httpMethod the HTTP method
      */
     public void setHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        Objects.requireNonNull(httpMethod, "parameter httpMethod cannot be null");
         method = httpMethod;
     }
 
@@ -470,7 +480,7 @@ public void setHttpMethod(@Nonnull final HttpMethod httpMethod) {
      */
     @Nullable
     public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
-        method = httpMethod;
+        setHttpMethod(httpMethod);
         return this;
     }
 
@@ -518,7 +528,8 @@ public int getMaxRedirects() {
      * @param shouldRedirect Callback called before doing a redirect
      */
     public void setShouldRedirect(@Nonnull IShouldRedirect shouldRedirect) {
-    	this.shouldRedirect = shouldRedirect;
+    	Objects.requireNonNull(shouldRedirect, "parameter shouldRedirect cannot be null");
+        this.shouldRedirect = shouldRedirect;
     }
 
     /**
@@ -537,7 +548,8 @@ public IShouldRedirect getShouldRedirect() {
      * @param shouldretry The callback called before retry
      */
     public void setShouldRetry(@Nonnull IShouldRetry shouldretry) {
-    	this.shouldRetry = shouldretry;
+    	Objects.requireNonNull(shouldretry, "parameter shouldretry cannot be null");
+        this.shouldRetry = shouldretry;
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
index aff5e8795..b99deaa66 100644
--- a/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseRequestBuilder.java
@@ -28,6 +28,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Arrays;
 
 import javax.annotation.Nullable;
@@ -65,8 +66,8 @@ public BaseRequestBuilder(
             @Nonnull final IBaseClient<?> client,
             @Nullable final List<? extends Option> options
     ) {
-        this.requestUrl = requestUrl;
-        this.client = client;
+        this.requestUrl = Objects.requireNonNull(requestUrl, "parameter requestUrl cannot be null");
+        this.client = Objects.requireNonNull(client, "parameter client cannot be null");
         if (options != null) {
             this.options.addAll(options);
         }
@@ -113,6 +114,7 @@ public List<? extends Option> getOptions(@Nonnull final Option... requestOptions
      */
     @Nonnull
     public String getRequestUrlWithAdditionalSegment(@Nonnull final String urlSegment) {
+        Objects.requireNonNull(urlSegment, "parameter urlSegment cannot be null");
         return requestUrl + "/" + urlSegment;
     }
 
@@ -124,6 +126,7 @@ public String getRequestUrlWithAdditionalSegment(@Nonnull final String urlSegmen
      */
     @Nonnull
     public String getRequestUrlWithAdditionalParameter(@Nonnull final String parameter) {
+        Objects.requireNonNull(parameter, "parameter cannot be null");
         return requestUrl + "('" + parameter + "')";
     }
 
diff --git a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
index adb8a7ee9..ae5f69984 100644
--- a/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseStreamRequest.java
@@ -32,6 +32,7 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -96,6 +97,7 @@ protected InputStream send() throws ClientException {
     @SuppressWarnings("unchecked")
     @Nonnull
     protected java.util.concurrent.CompletableFuture<T> sendAsync(@Nonnull final byte[] fileContents) {
+        Objects.requireNonNull(fileContents, "parameter fileContents cannot be null");
         baseRequest.setHttpMethod(HttpMethod.PUT);
         return baseRequest.getClient().getHttpProvider().sendAsync(this, (Class<T>) baseRequest.getResponseType(), fileContents);
     }
@@ -108,6 +110,7 @@ protected java.util.concurrent.CompletableFuture<T> sendAsync(@Nonnull final byt
      */
     @Nullable
     protected T send(@Nonnull final byte[] fileContents) {
+        Objects.requireNonNull(fileContents, "parameter fileContents cannot be null");
         baseRequest.setHttpMethod(HttpMethod.PUT);
         return (T) baseRequest.getClient().getHttpProvider().send(this, baseRequest.getResponseType(), fileContents);
     }
@@ -141,7 +144,8 @@ public HttpMethod getHttpMethod() {
      * @param value  the value of the header
      */
     @Override
-    public void addHeader(@Nonnull final String header, @Nonnull final String value) {
+    public void addHeader(@Nonnull final String header, @Nullable final String value) {
+        Objects.requireNonNull(header, "parameter header cannot be null");
         baseRequest.addHeader(header, value);
     }
 
@@ -211,6 +215,7 @@ public int getMaxRedirects() {
      * @param shouldRedirect Callback called before doing a redirect
      */
     public void setShouldRedirect(@Nonnull final IShouldRedirect shouldRedirect) {
+        Objects.requireNonNull(shouldRedirect, "parameter shouldRedirect cannot be null");
     	baseRequest.setShouldRedirect(shouldRedirect);
     }
 
@@ -230,6 +235,7 @@ public IShouldRedirect getShouldRedirect() {
      * @param shouldretry The callback called before retry
      */
     public void setShouldRetry(@Nonnull final IShouldRetry shouldretry) {
+        Objects.requireNonNull(shouldretry, "parameter shouldretry cannot be null");
     	baseRequest.setShouldRetry(shouldretry);
     }
 
@@ -287,6 +293,7 @@ public long getDelay() {
     @Override
     @Nullable
     public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
+        Objects.requireNonNull(httpMethod, "parameter httpMethod cannot be null");
         baseRequest.setHttpMethod(httpMethod);
         return this;
     }
@@ -301,7 +308,7 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
      */
     @Override
     @Nullable
-    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
+    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nullable final requestBodyType serializedObject) throws ClientException {
         return baseRequest.getHttpRequest(serializedObject);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
index 51caf56e5..b5ae56da9 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequest.java
@@ -27,6 +27,9 @@
 import com.microsoft.graph.serializer.IJsonBackedObject;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -58,6 +61,7 @@ public BaseWithReferenceRequest(@Nonnull final String requestUrl, @Nonnull final
      */
     @Nonnull
     public java.util.concurrent.CompletableFuture<T> postAsync(@Nullable final T newEntity, @Nonnull final IJsonBackedObject payload) {
+        Objects.requireNonNull(payload, "parameter payload cannot be null");
         return sendAsync(HttpMethod.POST, payload);
     }
 
@@ -69,7 +73,8 @@ public java.util.concurrent.CompletableFuture<T> postAsync(@Nullable final T new
      * @return the entity once request is executed
      */
     @Nullable
-    public T post(@Nonnull final T newEntity, @Nonnull final IJsonBackedObject payload) throws ClientException {
+    public T post(@Nullable final T newEntity, @Nonnull final IJsonBackedObject payload) throws ClientException {
+        Objects.requireNonNull(payload, "parameter payload cannot be null");
         final T response = send(HttpMethod.POST, payload);
         if (response != null){
             return newEntity;
@@ -119,6 +124,7 @@ public void delete() throws ClientException {
      */
     @Nonnull
 	public java.util.concurrent.CompletableFuture<T> patchAsync(@Nonnull final T sourceObject) {
+        Objects.requireNonNull(sourceObject, "parameter sourceObject cannot be null");
 		return sendAsync(HttpMethod.PATCH, sourceObject);
 	}
 
@@ -130,6 +136,7 @@ public java.util.concurrent.CompletableFuture<T> patchAsync(@Nonnull final T sou
      */
     @Nullable
 	public T patch(@Nonnull final T sourceObject) throws ClientException {
+        Objects.requireNonNull(sourceObject, "parameter sourceObject cannot be null");
 		return send(HttpMethod.PATCH, sourceObject);
 	}
 }
diff --git a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
index 5ecddab1a..b1ffe4d09 100644
--- a/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/BaseWithReferenceRequestBuilder.java
@@ -26,6 +26,7 @@
 import com.microsoft.graph.core.IBaseClient;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -52,8 +53,8 @@ public BaseWithReferenceRequestBuilder(@Nonnull final String requestUrl, @Nonnul
                                             @Nonnull final Class<T2> withReferenceRequestClass,
                                             @Nonnull final Class<T3> referenceRequestBuilderClass) {
         super(requestUrl, client, requestOptions);
-        this.wReferenceRequestClass = withReferenceRequestClass;
-        this.refRequestBuilderClass = referenceRequestBuilderClass;
+        this.wReferenceRequestClass = Objects.requireNonNull(withReferenceRequestClass, "parameter withReferenceRequestClass cannot be null");
+        this.refRequestBuilderClass = Objects.requireNonNull(referenceRequestBuilderClass, "parameter referenceRequestBuilderClass cannot be null");
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 4f8dbf059..3ee61dea2 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -135,6 +135,8 @@ public ISerializer getSerializer() {
 	public <Result, Body> java.util.concurrent.CompletableFuture<Result> sendAsync(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable) {
+        Objects.requireNonNull(request, "parameter request cannot be null");
+        Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
 		return sendAsync(request,
 							resultClass,
 							serializable,
@@ -159,6 +161,8 @@ public <Result, BodyType, DeserializeType> java.util.concurrent.CompletableFutur
                                                     @Nullable final BodyType serializable,
                                                     @Nullable final IStatefulResponseHandler<Result, DeserializeType> handler)
             throws ClientException {
+        Objects.requireNonNull(request, "parameter request cannot be null");
+        Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
         return sendRequestAsyncInternal(request,
                 resultClass,
                 serializable,
@@ -182,6 +186,8 @@ public <Result, Body> Result send(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable)
 					throws ClientException {
+        Objects.requireNonNull(request, "parameter request cannot be null");
+        Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
 		return send(request, resultClass, serializable, null);
 	}
 
@@ -203,6 +209,8 @@ public <Result, Body, DeserializeType> Result send(@Nonnull final IHttpRequest r
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable,
 			@Nullable final IStatefulResponseHandler<Result, DeserializeType> handler) throws ClientException {
+            Objects.requireNonNull(request, "parameter request cannot be null");
+            Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
             return sendRequestInternal(request, resultClass, serializable, handler);
 	}
 	/**
@@ -220,6 +228,8 @@ public <Result, Body, DeserializeType> Result send(@Nonnull final IHttpRequest r
 	public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request,
 			@Nonnull final Class<Result> resultClass,
 			@Nullable final Body serializable) throws ClientException {
+        Objects.requireNonNull(request, "parameter request cannot be null");
+        Objects.requireNonNull(resultClass, "parameter resultClass cannot be null");
 		final int defaultBufferSize = 4096;
 
 		final URL requestUrl = request.getRequestUrl();
@@ -575,6 +585,7 @@ private Request convertIHttpRequestToOkHttpRequest(IHttpRequest request) {
 	 */
     @Nullable
 	public static String streamToString(@Nonnull final InputStream input) {
+        Objects.requireNonNull(input, "parameter input cannot be null");
 		final String httpStreamEncoding = "UTF-8";
 		final String endOfFile = "\\A";
 		try (final Scanner scanner = new Scanner(input, httpStreamEncoding)) {
diff --git a/src/main/java/com/microsoft/graph/http/CustomRequest.java b/src/main/java/com/microsoft/graph/http/CustomRequest.java
index 594f4bba7..5d2b2f7c5 100644
--- a/src/main/java/com/microsoft/graph/http/CustomRequest.java
+++ b/src/main/java/com/microsoft/graph/http/CustomRequest.java
@@ -25,6 +25,9 @@
 import com.google.gson.JsonObject;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.core.ClientException;
@@ -122,6 +125,7 @@ public java.util.concurrent.CompletableFuture<T> patchAsync() {
      */
     @Nullable
     public T patch(@Nonnull final T sourceObject) throws ClientException {
+        Objects.requireNonNull(sourceObject, "parameter sourceObject cannot be null");
         return send(HttpMethod.PATCH, sourceObject);
     }
 
@@ -133,6 +137,7 @@ public T patch(@Nonnull final T sourceObject) throws ClientException {
      */
     @Nonnull
     public java.util.concurrent.CompletableFuture<T> postAsync(@Nonnull final T newObject) {
+        Objects.requireNonNull(newObject, "parameter newObject cannot be null");
         return sendAsync(HttpMethod.POST, newObject);
     }
 
@@ -145,6 +150,7 @@ public java.util.concurrent.CompletableFuture<T> postAsync(@Nonnull final T newO
      */
     @Nullable
     public T post(@Nonnull final T newObject) throws ClientException {
+        Objects.requireNonNull(newObject, "parameter newObject cannot be null");
         return send(HttpMethod.POST, newObject);
     }
 
@@ -156,6 +162,7 @@ public T post(@Nonnull final T newObject) throws ClientException {
      */
     @Nonnull
     public java.util.concurrent.CompletableFuture<T> putAsync(@Nonnull final T putObject) {
+        Objects.requireNonNull(putObject, "parameter putObject cannot be null");
         return sendAsync(HttpMethod.PUT, putObject);
     }
 
@@ -168,6 +175,7 @@ public java.util.concurrent.CompletableFuture<T> putAsync(@Nonnull final T putOb
      */
     @Nullable
     public T put(@Nonnull final T putObject) throws ClientException {
+        Objects.requireNonNull(putObject, "parameter putObject cannot be null");
         return send(HttpMethod.PUT, putObject);
     }
 
@@ -179,6 +187,7 @@ public T put(@Nonnull final T putObject) throws ClientException {
      */
      @Nonnull
      public CustomRequest<T> select(@Nonnull final String value) {
+         Objects.requireNonNull(value, "parameter value cannot be null");
          getQueryOptions().add(new QueryOption("$select", value));
          return this;
      }
@@ -191,6 +200,7 @@ public CustomRequest<T> select(@Nonnull final String value) {
      */
      @Nonnull
      public CustomRequest<T> expand(@Nonnull final String value) {
+         Objects.requireNonNull(value, "parameter value cannot be null");
          getQueryOptions().add(new QueryOption("$expand", value));
          return this;
      }
diff --git a/src/main/java/com/microsoft/graph/http/GraphError.java b/src/main/java/com/microsoft/graph/http/GraphError.java
index a4cba2355..a54db2263 100644
--- a/src/main/java/com/microsoft/graph/http/GraphError.java
+++ b/src/main/java/com/microsoft/graph/http/GraphError.java
@@ -29,6 +29,9 @@
 import com.google.gson.annotations.Expose;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 /**
@@ -60,6 +63,7 @@ public class GraphError {
      * @return <b>true</b> if the error code matches, and <b>false</b> if there was no match
      */
     public boolean isError(@Nonnull final GraphErrorCodes expectedCode) {
+        Objects.requireNonNull(expectedCode, "parameter expectedCode cannot be null");
         if (transformErrorCodeCase(code).equalsIgnoreCase(expectedCode.toString())) {
             return true;
         }
@@ -79,6 +83,7 @@ public boolean isError(@Nonnull final GraphErrorCodes expectedCode) {
      */
     @Nonnull
     protected String transformErrorCodeCase(@Nonnull final String original) {
+        Objects.requireNonNull(original, "parameter original cannot be null");
         return CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, original);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
index 801bb00b8..5e2f13994 100644
--- a/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
+++ b/src/main/java/com/microsoft/graph/http/GraphErrorResponse.java
@@ -27,6 +27,9 @@
 import com.google.gson.annotations.SerializedName;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.serializer.AdditionalDataManager;
@@ -57,8 +60,8 @@ public class GraphErrorResponse implements IJsonBackedObject {
      * Sets the raw JSON object
      */
     @Override
-    public void setRawObject(@Nullable final ISerializer serializer, @Nonnull final JsonObject json) {
-        rawObject = json;
+    public void setRawObject(@Nonnull final ISerializer serializer, @Nonnull final JsonObject json) {
+        rawObject = Objects.requireNonNull(json, "parameter json cannot be null");
     }
 
     @Override
diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index 7ef12cd26..d2718f6d4 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -153,13 +153,13 @@ protected GraphServiceException(@Nonnull final String method,
                                     @Nullable final GraphErrorResponse error,
                                     final boolean verbose) {
         super(responseMessage, null);
-        this.method = method;
-        this.url = url;
-        this.requestHeaders = requestHeaders;
+        this.method = Objects.requireNonNull(method, "parameter method cannot be null");
+        this.url = Objects.requireNonNull(url, "parameter url cannot be null");
+        this.requestHeaders = Objects.requireNonNull(requestHeaders, "parameter requestHeaders cannot be null");
         this.requestBody = requestBody;
         this.responseCode = responseCode;
-        this.responseMessage = responseMessage;
-        this.responseHeaders = responseHeaders;
+        this.responseMessage = Objects.requireNonNull(responseMessage, "parameter responseMessage cannot be null");
+        this.responseHeaders = Objects.requireNonNull(responseHeaders, "parameter responseHeaders cannot be null");
         this.error = error;
         this.verbose = verbose;
         for(String requestHeader : requestHeaders) {
@@ -340,7 +340,10 @@ public static <T> GraphServiceException createFromResponse(@Nonnull final IHttpR
                                                                  @Nonnull final Response response,
                                                                  @Nonnull final ILogger logger)
             throws IOException {
-        Objects.requireNonNull(response, "reponse parameter cannot be null");
+        Objects.requireNonNull(response, "response parameter cannot be null");
+        Objects.requireNonNull(request, "request parameter cannot be null");
+        Objects.requireNonNull(serializer, "serializer parameter cannot be null");
+        Objects.requireNonNull(logger, "logger parameter cannot be null");
         final String method = response.request().method();
         final String url = request.getRequestUrl().toString();
         final List<String> requestHeaders = new LinkedList<>();
@@ -398,6 +401,7 @@ public static GraphServiceException createFromResponse(@Nullable final String ur
         @Nullable final String requestBody,
         @Nonnull final Map<String,String> headers, @Nonnull final String responseMessage, final int responseCode,
         @Nonnull final GraphErrorResponse error, final boolean isVerbose) {
+        Objects.requireNonNull(headers, "parameter headers cannot be null");
         final List<String> responseHeaders = new LinkedList<>();
         for (final Entry<String, String> entry : headers.entrySet()) {
             responseHeaders.add(entry.getKey() + (entry.getKey() == null ? "" : " : " ) + entry.getValue());
diff --git a/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java b/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
index 8260c8744..0222d1c13 100644
--- a/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
+++ b/src/main/java/com/microsoft/graph/http/PrimitiveRequestBuilder.java
@@ -23,6 +23,9 @@
 package com.microsoft.graph.http;
 
 import javax.annotation.Nullable;
+
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 import com.microsoft.graph.core.IBaseClient;
 
@@ -43,7 +46,7 @@ public class PrimitiveRequestBuilder<T> extends BaseRequestBuilder<T> {
      */
     public PrimitiveRequestBuilder(@Nonnull final String requestUrl, @Nonnull final IBaseClient<?> client, @Nullable final java.util.List<? extends com.microsoft.graph.options.Option> requestOptions, @Nonnull final Class<T> primitiveTypeClass) {
         super(requestUrl, client, requestOptions);
-        this._returnTypeClass = primitiveTypeClass;
+        this._returnTypeClass = Objects.requireNonNull(primitiveTypeClass, "paramter primitiveTypeClass cannot be null");
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
index 828c17cdb..45b577cab 100644
--- a/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
+++ b/src/main/java/com/microsoft/graph/http/ReferenceRequestBody.java
@@ -26,7 +26,8 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-import javax.annotation.Nullable;
+import java.util.Objects;
+
 import javax.annotation.Nonnull;
 
 import com.microsoft.graph.serializer.AdditionalDataManager;
@@ -49,7 +50,7 @@ public class ReferenceRequestBody implements IJsonBackedObject {
      * @param payload payload to instanciate the body from
      */
     public ReferenceRequestBody(@Nonnull final String payload) {
-        odataId = payload;
+        odataId = Objects.requireNonNull(payload, "parameter payload cannot be null");
     }
 
     /**
diff --git a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
index 4e421170b..34ad32aec 100644
--- a/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
+++ b/src/main/java/com/microsoft/graph/httpcore/HttpClients.java
@@ -3,6 +3,7 @@
 import com.microsoft.graph.authentication.IAuthenticationProvider;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -44,6 +45,7 @@ public static Builder custom() {
      */
     @Nonnull
     public static OkHttpClient createDefault(@Nonnull final IAuthenticationProvider auth) {
+        Objects.requireNonNull(auth, "parameter auth cannot be null");
         return custom()
                 .addInterceptor(new AuthenticationHandler(auth))
                 .addInterceptor(new RetryHandler())
diff --git a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
index ecdf6ae01..22ee826d2 100644
--- a/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
+++ b/src/main/java/com/microsoft/graph/httpcore/middlewareoption/TelemetryOptions.java
@@ -1,5 +1,6 @@
 package com.microsoft.graph.httpcore.middlewareoption;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import javax.annotation.Nonnull;
@@ -67,7 +68,7 @@ public String getSerializedFeatureUsage() {
      * @param clientRequestId the client request id to set, preferably the string representation of a GUID
      */
     public void setClientRequestId(@Nonnull final String clientRequestId) {
-        this.clientRequestId = clientRequestId;
+        this.clientRequestId = Objects.requireNonNull(clientRequestId, "parameter clientRequestId cannot be null");
     }
     /**
      * Gets the client request id
diff --git a/src/main/java/com/microsoft/graph/logger/DefaultLogger.java b/src/main/java/com/microsoft/graph/logger/DefaultLogger.java
index 2b42b66e4..610cebaec 100644
--- a/src/main/java/com/microsoft/graph/logger/DefaultLogger.java
+++ b/src/main/java/com/microsoft/graph/logger/DefaultLogger.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
@@ -22,6 +22,7 @@
 
 package com.microsoft.graph.logger;
 
+import java.util.Objects;
 import java.util.logging.Logger;
 
 import javax.annotation.Nullable;
@@ -36,22 +37,22 @@ public class DefaultLogger implements ILogger {
      * The logging level
      */
     private LoggerLevel level = LoggerLevel.ERROR;
-    
+
     private final static Logger LOGGER = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
 
     /**
      * Sets the logging level of this logger
-     * 
+     *
      * @param level the level to log at
      */
     public void setLoggingLevel(@Nonnull final LoggerLevel level) {
     	LOGGER.info("Setting logging level to " + level);
-    	this.level = level;
+    	this.level = Objects.requireNonNull(level, "parameter level cannot be null");
     }
 
     /**
      * Gets the logging level of this logger
-     * 
+     *
      * @return the level the logger is set to
      */
     @Nonnull
@@ -61,7 +62,7 @@ public LoggerLevel getLoggingLevel() {
 
     /**
      * Creates the tag automatically
-     * 
+     *
      * @return the tag for the current method
      * Sourced from https://gist.github.com/eefret/a9c7ac052854a10a8936
      */
@@ -85,11 +86,12 @@ private String getTag() {
 
     /**
      * Logs a debug message
-     * 
+     *
      * @param message the message
      */
     @Override
     public void logDebug(@Nonnull final String message) {
+        Objects.requireNonNull(message, "parameter message cannot be null");
     	if(this.level == LoggerLevel.DEBUG)
                 for (final String line : message.split("\n")) {
                 	LOGGER.info(line);
@@ -99,12 +101,14 @@ public void logDebug(@Nonnull final String message) {
 
     /**
      * Logs an error message with throwable
-     * 
+     *
      * @param message   the message
      * @param throwable the throwable
      */
     @Override
     public void logError(@Nonnull final String message, @Nonnull final Throwable throwable) {
+        Objects.requireNonNull(message, "parameter message cannot be null");
+        Objects.requireNonNull(throwable, "parameter throwable cannot be null");
         switch (level) {
             case DEBUG:
             case ERROR:
diff --git a/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java b/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java
index f9eb3d4d9..fe07cf0c1 100644
--- a/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/ByteArraySerializer.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
@@ -25,6 +25,7 @@
 import com.google.common.io.BaseEncoding;
 
 import java.text.ParseException;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -42,13 +43,14 @@ private ByteArraySerializer() {
 
     /**
      * Deserializes a string
-     * 
+     *
      * @param strVal          the value to deserialize
      * @return                the string encoded bytes
      * @throws ParseException if there is any problem processing the value
      */
     @Nullable
     public static byte[] deserialize(@Nonnull final String strVal) throws ParseException {
+        Objects.requireNonNull(strVal, "parameter strVal cannot be null");
     	return BaseEncoding.base64().decode(strVal);
     }
 
@@ -60,6 +62,7 @@ public static byte[] deserialize(@Nonnull final String strVal) throws ParseExcep
      */
     @Nullable
     public static String serialize(@Nonnull final byte[] src) {
+        Objects.requireNonNull(src, "parameter src cannot be null");
         return BaseEncoding.base64().encode(src);
     }
 }
diff --git a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
index 6431aa676..dd305b532 100644
--- a/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/CollectionPageSerializer.java
@@ -26,6 +26,7 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -69,6 +70,7 @@ public static <T1, T2 extends BaseRequestBuilder<T1>> JsonElement serialize(@Non
         if(src == null) {
             return null;
         }
+        Objects.requireNonNull(logger, "parameter logger cannot be null");
         JsonArray jsonArray = new JsonArray();
         List<T1> items = src.getCurrentPage();
         serializer = new DefaultSerializer(logger);
diff --git a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
index 51075262c..bf520e224 100644
--- a/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/DefaultSerializer.java
@@ -40,6 +40,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Map.Entry;
 
 import javax.annotation.Nonnull;
@@ -67,20 +68,22 @@ public class DefaultSerializer implements ISerializer {
 	 * @param logger the logger
 	 */
 	public DefaultSerializer(@Nonnull final ILogger logger) {
-		this.logger = logger;
+		this.logger = Objects.requireNonNull(logger, "parameter logger cannot be null");
 		this.gson = GsonFactory.getGsonInstance(logger);
 	}
 
 	@Override
 	@Nullable
-	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
-		final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
+	public <T> T deserializeObject(@Nonnull final String inputString, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders) {
+		Objects.requireNonNull(inputString, "parameter inputString cannot be null");
+        final JsonElement rawElement = gson.fromJson(inputString, JsonElement.class);
 		return deserializeObject(rawElement, clazz, responseHeaders);
 	}
 
 	@Override
 	@Nullable
-	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
+	public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders) {
+		Objects.requireNonNull(inputStream, "parameter inputStream cannot be null");
         T result = null;
         try (final InputStreamReader streamReader =  new InputStreamReader(inputStream, "UTF-8")) {
 			final JsonElement rawElement = gson.fromJson(streamReader, JsonElement.class);
@@ -94,7 +97,9 @@ public <T> T deserializeObject(@Nonnull final InputStream inputStream, @Nonnull
 	@SuppressWarnings("unchecked")
 	@Override
 	@Nullable
-	public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull final Class<T> clazz, @Nonnull final Map<String, List<String>> responseHeaders) {
+	public <T> T deserializeObject(@Nonnull final JsonElement rawElement, @Nonnull final Class<T> clazz, @Nullable final Map<String, List<String>> responseHeaders) {
+		Objects.requireNonNull(rawElement, "parameter rawElement cannot be null");
+		Objects.requireNonNull(clazz, "parameter clazz cannot be null");
 		final T jsonObject = gson.fromJson(rawElement, clazz);
 
 		// Populate the JSON-backed fields for any annotations that are not in the object model
@@ -216,6 +221,7 @@ else if (fieldObject instanceof IJsonBackedObject) {
 	@Override
 	@Nullable
 	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);
 
@@ -353,6 +359,7 @@ private void addAdditionalDataFromManagerToJson(AdditionalDataManager additional
 	 */
 	@Nullable
 	public Class<?> getDerivedClass(@Nonnull final JsonObject jsonObject, @Nullable final Class<?> parentClass) {
+        Objects.requireNonNull(jsonObject, "parameter jsonObject cannot be null");
 		//Identify the odata.type information if provided
 		if (jsonObject.get(ODATA_TYPE_KEY) != null) {
 			/** #microsoft.graph.user or #microsoft.graph.callrecords.callrecord */
diff --git a/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java b/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java
index 1e994f672..8acf07ce0 100644
--- a/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/EnumSetSerializer.java
@@ -29,6 +29,7 @@
 import java.lang.reflect.Type;
 import java.util.EnumSet;
 import java.util.Iterator;
+import java.util.Objects;
 
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
@@ -47,7 +48,8 @@ public class EnumSetSerializer {
      * @param logger logger to use during serialization
      */
     public EnumSetSerializer(@Nonnull final ILogger logger) {
-         gson = new GsonBuilder().registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger)).create();
+        Objects.requireNonNull(logger, "parameter logger cannot be null");
+        gson = new GsonBuilder().registerTypeAdapterFactory(new FallbackTypeAdapterFactory(logger)).create();
     }
 
     /**
@@ -59,8 +61,10 @@ public EnumSetSerializer(@Nonnull final ILogger logger) {
      */
     @Nullable
     public EnumSet<?> deserialize(@Nonnull final Type type, @Nonnull final String jsonStrToDeserialize) {
-            final String arrayString = "[" + jsonStrToDeserialize + "]";
-            return jsonStrToDeserialize == null ? null : (EnumSet<?>) gson.fromJson(arrayString, type);
+        Objects.requireNonNull(type, "parameter type cannot be null");
+        Objects.requireNonNull(jsonStrToDeserialize, "parameter jsonStrToDeserialize cannot be null");
+        final String arrayString = "[" + jsonStrToDeserialize + "]";
+        return jsonStrToDeserialize == null ? null : (EnumSet<?>) gson.fromJson(arrayString, type);
     }
 
     /**
@@ -71,6 +75,7 @@ public EnumSet<?> deserialize(@Nonnull final Type type, @Nonnull final String js
      */
     @Nullable
     public JsonPrimitive serialize(@Nonnull final EnumSet<?> src) {
+        Objects.requireNonNull(src, "parameter src cannot be null");
         final StringBuilder serializedStringBuilder = new StringBuilder();
 
         final Iterator<?> i = src.iterator();
diff --git a/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java b/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java
index 13dfe7941..9c439c65d 100644
--- a/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.java
+++ b/src/main/java/com/microsoft/graph/serializer/FallbackTypeAdapterFactory.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
@@ -25,6 +25,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import com.google.common.base.CaseFormat;
 import com.google.gson.Gson;
@@ -40,7 +41,7 @@
 import javax.annotation.Nonnull;
 
 /**
- * Handles serialization/deserialization for special types (especially of 
+ * Handles serialization/deserialization for special types (especially of
  * fields which are not caught by registering a type adapter).
  */
 public final class FallbackTypeAdapterFactory implements TypeAdapterFactory {
@@ -54,7 +55,7 @@ public final class FallbackTypeAdapterFactory implements TypeAdapterFactory {
      * The logger instance
      */
     private final ILogger logger;
-    
+
     /**
      * Serializes an instance of Void (which is always null).
      */
@@ -69,15 +70,16 @@ public void write(JsonWriter out, Void value) throws IOException {
         public Void read(JsonReader in) throws IOException {
             return null;
         }
-        
+
     };
-    
+
     /**
      * Instanciates a new type adapter factory
-     * 
+     *
      * @param logger logger to use for the factory
      */
     public FallbackTypeAdapterFactory(@Nonnull final ILogger logger) {
+        Objects.requireNonNull(logger, "parameter logger cannot be null");
         this.logger = logger;
     }
 
@@ -85,6 +87,7 @@ public FallbackTypeAdapterFactory(@Nonnull final ILogger logger) {
     @Override
     @Nullable
     public <T> TypeAdapter<T> create(@Nonnull final Gson gson, @Nonnull final TypeToken<T> type) {
+        Objects.requireNonNull(type, "parameter type cannot be null");
         final Class<T> rawType = (Class<T>) type.getRawType();
         if (rawType.isEnum()) {
             return new EnumTypeAdapter<T>(rawType, logger);
@@ -95,9 +98,9 @@ public <T> TypeAdapter<T> create(@Nonnull final Gson gson, @Nonnull final TypeTo
             return null;
         }
     }
-    
+
     private static final class EnumTypeAdapter<T> extends TypeAdapter<T> {
-        
+
         private final Map<String, T> enumValues;
         private final ILogger logger;
 
@@ -110,7 +113,7 @@ private static final class EnumTypeAdapter<T> extends TypeAdapter<T> {
             }
             this.enumValues = enumValues;
         }
-        
+
         @Override
         public void write(final JsonWriter out, final T value) throws IOException {
             if (value == null) {
diff --git a/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java b/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java
index aa55ec120..2e8288176 100644
--- a/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/OffsetDateTimeSerializer.java
@@ -26,6 +26,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 import java.time.OffsetDateTime;
@@ -58,6 +59,7 @@ private OffsetDateTimeSerializer() {
      */
     @Nullable
     public static OffsetDateTime deserialize(@Nonnull final String strVal) throws ParseException {
+        Objects.requireNonNull(strVal, "parameter strVal cannot be null");
         final String[] sections = strVal.split("T");
         return OffsetDateTime.parse(missingColonPattern
                                         .matcher((sections.length == 2 &&
@@ -79,6 +81,7 @@ public static OffsetDateTime deserialize(@Nonnull final String strVal) throws Pa
      */
     @Nonnull
     public static String serialize(@Nonnull final OffsetDateTime src) {
+        Objects.requireNonNull(src, "parameter src cannot be null");
         return src.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
     }
 }
diff --git a/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
index 3d451081e..da540d5cb 100644
--- a/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphErrorResponseTests.java
@@ -1,10 +1,12 @@
 package com.microsoft.graph.http;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
 import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonObject;
+import com.microsoft.graph.serializer.ISerializer;
 
 public class GraphErrorResponseTests {
 
@@ -12,7 +14,7 @@ public class GraphErrorResponseTests {
 	public void testSetRawObject() {
         JsonObject expectedJson = new JsonObject();
         GraphErrorResponse errorResponse = new GraphErrorResponse();
-        errorResponse.setRawObject(null,expectedJson);
+        errorResponse.setRawObject(mock(ISerializer.class),expectedJson);
         assertEquals(expectedJson, errorResponse.rawObject);
     }
 

From 76c0c7e35dbdacb364a8e86e097507382130f622 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Fri, 19 Feb 2021 09:03:30 -0500
Subject: [PATCH 205/213] - fixes a bug where errors would be swallowed for
 chunk upload requests

---
 .../com/microsoft/graph/concurrency/ChunkedUploadRequest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
index 1ac59126c..7b9d6a10a 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
@@ -104,6 +104,6 @@ public ChunkedUploadResult<UploadType> upload(
             return result;
         } else
             return new ChunkedUploadResult<UploadType>(
-                new ClientException("Upload session failed.", null));
+                new ClientException("Upload session failed.", result == null ? null : result.getError()));
     }
 }

From 212ae1f6c0d5bcab392268b566daa4c886be7c81 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 1 Mar 2021 12:23:31 -0500
Subject: [PATCH 206/213] - fixes a bug where the nullability annotation would
 be stricter than the interface

---
 .../java/com/microsoft/graph/http/BaseCollectionRequest.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
index c148ef198..694703cb2 100644
--- a/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
+++ b/src/main/java/com/microsoft/graph/http/BaseCollectionRequest.java
@@ -441,8 +441,7 @@ public IHttpRequest withHttpMethod(@Nonnull final HttpMethod httpMethod) {
      */
     @Override
     @Nullable
-    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nonnull final requestBodyType serializedObject) throws ClientException {
-        Objects.requireNonNull(serializedObject, "parameter serializedObject cannot be null");
+    public <requestBodyType, responseType, nativeRequestType> nativeRequestType getHttpRequest(@Nullable final requestBodyType serializedObject) throws ClientException {
         return baseRequest.getHttpRequest(serializedObject);
     }
 }

From 156b6c565065a8cb200de2dbe922e4f49b7f8e03 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 1 Mar 2021 13:52:14 -0500
Subject: [PATCH 207/213] - renames large file upload to match specification

---
 spotBugsExcludeFilter.xml                     |  4 ++--
 .../IProgressCallback.java                    |  2 +-
 .../IUploadSession.java                       |  2 +-
 .../LargeFileUploadRequest.java}              | 20 ++++++++---------
 .../LargeFileUploadResponseHandler.java}      | 22 +++++++++----------
 .../LargeFileUploadResult.java}               | 12 +++++-----
 .../LargeFileUploadTask.java}                 | 16 +++++++-------
 7 files changed, 39 insertions(+), 39 deletions(-)
 rename src/main/java/com/microsoft/graph/{concurrency => tasks}/IProgressCallback.java (97%)
 rename src/main/java/com/microsoft/graph/{concurrency => tasks}/IUploadSession.java (98%)
 rename src/main/java/com/microsoft/graph/{concurrency/ChunkedUploadRequest.java => tasks/LargeFileUploadRequest.java} (80%)
 rename src/main/java/com/microsoft/graph/{concurrency/ChunkedUploadResponseHandler.java => tasks/LargeFileUploadResponseHandler.java} (84%)
 rename src/main/java/com/microsoft/graph/{concurrency/ChunkedUploadResult.java => tasks/LargeFileUploadResult.java} (88%)
 rename src/main/java/com/microsoft/graph/{concurrency/ChunkedUploadProvider.java => tasks/LargeFileUploadTask.java} (94%)

diff --git a/spotBugsExcludeFilter.xml b/spotBugsExcludeFilter.xml
index 31e4a5f86..c6b2fff2e 100644
--- a/spotBugsExcludeFilter.xml
+++ b/spotBugsExcludeFilter.xml
@@ -9,11 +9,11 @@ xsi:schemaLocation="https://github.com/spotbugs/filter/3.0.0 https://raw.githubu
 		<Bug code="NP" />
 	</Match>
 	<Match>
-		<Class name="com.microsoft.graph.concurrency.ChunkedUploadRequest" />
+		<Class name="com.microsoft.graph.tasks.LargeFileUploadRequest" />
 		<Bug code="Dm" />
 	</Match>
 	<Match>
-		<Class name="com.microsoft.graph.concurrency.ChunkedUploadResponseHandler" />
+		<Class name="com.microsoft.graph.tasks.LargeFileUploadResponseHandler" />
 		<Method name="generateResult" />
 		<Bug code="RCN,NP" />
 	</Match>
diff --git a/src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java b/src/main/java/com/microsoft/graph/tasks/IProgressCallback.java
similarity index 97%
rename from src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java
rename to src/main/java/com/microsoft/graph/tasks/IProgressCallback.java
index 66a295e5c..0a27f5d4f 100644
--- a/src/main/java/com/microsoft/graph/concurrency/IProgressCallback.java
+++ b/src/main/java/com/microsoft/graph/tasks/IProgressCallback.java
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // ------------------------------------------------------------------------------
 
-package com.microsoft.graph.concurrency;
+package com.microsoft.graph.tasks;
 
 /**
  * A callback that describes how to deal with success, failure, and progress
diff --git a/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java b/src/main/java/com/microsoft/graph/tasks/IUploadSession.java
similarity index 98%
rename from src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
rename to src/main/java/com/microsoft/graph/tasks/IUploadSession.java
index 49e36e220..717bdde43 100644
--- a/src/main/java/com/microsoft/graph/concurrency/IUploadSession.java
+++ b/src/main/java/com/microsoft/graph/tasks/IUploadSession.java
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // ------------------------------------------------------------------------------
 
-package com.microsoft.graph.concurrency;
+package com.microsoft.graph.tasks;
 
 import java.util.List;
 
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java
similarity index 80%
rename from src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
rename to src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java
index 7b9d6a10a..fac314089 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java
@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-package com.microsoft.graph.concurrency;
+package com.microsoft.graph.tasks;
 
 import java.util.List;
 import java.util.Locale;
@@ -21,7 +21,7 @@
  * The chunk upload request.
  * @param <UploadType>    The upload item type.
  */
-public class ChunkedUploadRequest<UploadType> {
+public class LargeFileUploadRequest<UploadType> {
 
     /**
      * Content Range header name.
@@ -41,7 +41,7 @@ public class ChunkedUploadRequest<UploadType> {
     /**
      * The base request.
      */
-    private final BaseRequest<ChunkedUploadResult<UploadType>> baseRequest;
+    private final BaseRequest<LargeFileUploadResult<UploadType>> baseRequest;
 
     /**
      * Construct the ChunkedUploadRequest
@@ -55,7 +55,7 @@ public class ChunkedUploadRequest<UploadType> {
      * @param totalLength The total length of the input stream.
      */
     @SuppressWarnings("unchecked")
-    protected ChunkedUploadRequest(@Nonnull final String requestUrl,
+    protected LargeFileUploadRequest(@Nonnull final String requestUrl,
                                 @Nonnull final IBaseClient<?> client,
                                 @Nullable final List<? extends Option> options,
                                 @Nonnull final byte[] chunk,
@@ -67,7 +67,7 @@ protected ChunkedUploadRequest(@Nonnull final String requestUrl,
         Objects.requireNonNull(chunk, "parameter chunk cannot be null");
         this.data = new byte[chunkSize];
         System.arraycopy(chunk, 0, this.data, 0, chunkSize);
-        this.baseRequest = new BaseRequest<ChunkedUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends ChunkedUploadResult<UploadType>>)(new ChunkedUploadResult<>((UploadType)null)).getClass()) {
+        this.baseRequest = new BaseRequest<LargeFileUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends LargeFileUploadResult<UploadType>>)(new LargeFileUploadResult<>((UploadType)null)).getClass()) {
         };
         this.baseRequest.setHttpMethod(HttpMethod.PUT);
         this.baseRequest.addHeader(CONTENT_RANGE_HEADER_NAME,
@@ -86,16 +86,16 @@ protected ChunkedUploadRequest(@Nonnull final String requestUrl,
      */
     @SuppressWarnings("unchecked")
     @Nonnull
-    public ChunkedUploadResult<UploadType> upload(
-            @Nonnull final ChunkedUploadResponseHandler<UploadType> responseHandler) {
+    public LargeFileUploadResult<UploadType> upload(
+            @Nonnull final LargeFileUploadResponseHandler<UploadType> responseHandler) {
         Objects.requireNonNull(responseHandler, "parameter responseHandler cannot be null");
-        ChunkedUploadResult<UploadType> result = null;
+        LargeFileUploadResult<UploadType> result = null;
 
         try {
             result = this.baseRequest
                     .getClient()
                     .getHttpProvider()
-                    .send(baseRequest, (Class<ChunkedUploadResult<UploadType>>)(Class<?>) ChunkedUploadResult.class, this.data, responseHandler);
+                    .send(baseRequest, (Class<LargeFileUploadResult<UploadType>>)(Class<?>) LargeFileUploadResult.class, this.data, responseHandler);
         } catch (final ClientException e) {
             throw new ClientException("Request failed with error, retry if necessary.", e);
         }
@@ -103,7 +103,7 @@ public ChunkedUploadResult<UploadType> upload(
         if (result != null && result.chunkCompleted()) {
             return result;
         } else
-            return new ChunkedUploadResult<UploadType>(
+            return new LargeFileUploadResult<UploadType>(
                 new ClientException("Upload session failed.", result == null ? null : result.getError()));
     }
 }
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java
similarity index 84%
rename from src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
rename to src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java
index c571407a0..40ab93779 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // ------------------------------------------------------------------------------
 
-package com.microsoft.graph.concurrency;
+package com.microsoft.graph.tasks;
 
 import com.google.common.io.ByteStreams;
 
@@ -51,8 +51,8 @@
  *
  * @param <UploadType> the expected uploaded item
  */
-public class ChunkedUploadResponseHandler<UploadType>
-		implements IStatefulResponseHandler<ChunkedUploadResult<UploadType>, UploadType> {
+public class LargeFileUploadResponseHandler<UploadType>
+		implements IStatefulResponseHandler<LargeFileUploadResult<UploadType>, UploadType> {
 	/**
 	 * The expected deserialized upload type
 	 */
@@ -65,7 +65,7 @@ public class ChunkedUploadResponseHandler<UploadType>
 	 * @param uploadType the expected upload item type
      * @param uploadSessionType the type of the upload session
 	 */
-	protected ChunkedUploadResponseHandler(@Nonnull final Class<UploadType> uploadType, @Nonnull final Class<? extends IUploadSession>  uploadSessionType) {
+	protected LargeFileUploadResponseHandler(@Nonnull final Class<UploadType> uploadType, @Nonnull final Class<? extends IUploadSession>  uploadSessionType) {
         this.deserializeTypeClass = Objects.requireNonNull(uploadType, "parameter uploadType cannot be null");
         this.uploadSessionClass = Objects.requireNonNull(uploadSessionType, "parameter uploadSessionType cannot be null");
 	}
@@ -92,7 +92,7 @@ public void configConnection(@Nonnull final Response response) {
 	 */
 	@Override
 	@Nullable
-	public ChunkedUploadResult<UploadType> generateResult(
+	public LargeFileUploadResult<UploadType> generateResult(
 			@Nonnull final IHttpRequest request,
 			@Nonnull final Response response,
 			@Nonnull final ISerializer serializer,
@@ -104,7 +104,7 @@ public ChunkedUploadResult<UploadType> generateResult(
 		if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
 			logger.logDebug("Receiving error during upload, see detail on result error");
 
-			return new ChunkedUploadResult<>(
+			return new LargeFileUploadResult<>(
 					GraphServiceException.createFromResponse(request, null, serializer,
 							response, logger));
 		} else if (response.code() >= HTTP_OK
@@ -117,17 +117,17 @@ public ChunkedUploadResult<UploadType> generateResult(
                     return parseJsonUploadResult(body, serializer, logger);
                 } else if (location != null) {
                     logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
-                    return new ChunkedUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
+                    return new LargeFileUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
                 } else {
                     logger.logDebug("Upload session returned an unexpected response");
                 }
             }
 		}
-		return new ChunkedUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
+		return new LargeFileUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
 	}
 
 	@Nonnull
-	private ChunkedUploadResult<UploadType> parseJsonUploadResult(@Nonnull final ResponseBody responseBody, @Nonnull final ISerializer serializer, @Nonnull final ILogger logger) throws IOException {
+	private LargeFileUploadResult<UploadType> parseJsonUploadResult(@Nonnull final ResponseBody responseBody, @Nonnull final ISerializer serializer, @Nonnull final ILogger logger) throws IOException {
 		try (final InputStream in = responseBody.byteStream()) {
 			final byte[] responseBytes = ByteStreams.toByteArray(in);
 			final IUploadSession session = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), uploadSessionClass);
@@ -135,10 +135,10 @@ private ChunkedUploadResult<UploadType> parseJsonUploadResult(@Nonnull final Res
 			if (session == null || session.getNextExpectedRanges() == null) {
 				logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
 				final UploadType uploadedItem = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), this.deserializeTypeClass);
-				return new ChunkedUploadResult<>(uploadedItem);
+				return new LargeFileUploadResult<>(uploadedItem);
 			} else {
 				logger.logDebug("Chunk bytes has been accepted by the server.");
-				return new ChunkedUploadResult<>(session);
+				return new LargeFileUploadResult<>(session);
 			}
 		}
 	}
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java
similarity index 88%
rename from src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
rename to src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java
index 7894bb55c..1d93a06fe 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadResult.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java
@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 // ------------------------------------------------------------------------------
 
-package com.microsoft.graph.concurrency;
+package com.microsoft.graph.tasks;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.http.GraphServiceException;
@@ -16,7 +16,7 @@
 /**
  * Wrapper class for different upload response from server.
  */
-public class ChunkedUploadResult<UploadType> {
+public class LargeFileUploadResult<UploadType> {
     /**
      * The uploaded item response.
      */
@@ -37,7 +37,7 @@ public class ChunkedUploadResult<UploadType> {
      *
      * @param uploaded The created item.
      */
-    protected ChunkedUploadResult(@Nullable final UploadType uploaded) {
+    protected LargeFileUploadResult(@Nullable final UploadType uploaded) {
         this.uploadedItem = uploaded;
         this.session = null;
         this.error = null;
@@ -48,7 +48,7 @@ protected ChunkedUploadResult(@Nullable final UploadType uploaded) {
      *
      * @param session The next session.
      */
-    protected ChunkedUploadResult(@Nullable final IUploadSession session) {
+    protected LargeFileUploadResult(@Nullable final IUploadSession session) {
         this.session = session;
         this.uploadedItem = null;
         this.error = null;
@@ -59,7 +59,7 @@ protected ChunkedUploadResult(@Nullable final IUploadSession session) {
      *
      * @param error The error occurred during uploading.
      */
-    protected ChunkedUploadResult(@Nullable final ClientException error) {
+    protected LargeFileUploadResult(@Nullable final ClientException error) {
         this.error = error;
         this.uploadedItem = null;
         this.session = null;
@@ -70,7 +70,7 @@ protected ChunkedUploadResult(@Nullable final ClientException error) {
      *
      * @param exception The exception received from server.
      */
-    protected ChunkedUploadResult(@Nonnull final GraphServiceException exception) {
+    protected LargeFileUploadResult(@Nonnull final GraphServiceException exception) {
         this(new ClientException(Objects
                                 .requireNonNull(exception, "parameter exception cannot be null")
                                 .getMessage(/* verbose */ true),
diff --git a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
similarity index 94%
rename from src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
rename to src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
index ce0c61989..7db50f8a2 100644
--- a/src/main/java/com/microsoft/graph/concurrency/ChunkedUploadProvider.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // ------------------------------------------------------------------------------
 
-package com.microsoft.graph.concurrency;
+package com.microsoft.graph.tasks;
 
 import com.microsoft.graph.core.ClientException;
 import com.microsoft.graph.core.IBaseClient;
@@ -42,7 +42,7 @@
  *
  * @param <UploadType> the upload item type
  */
-public class ChunkedUploadProvider<UploadType> {
+public class LargeFileUploadTask<UploadType> {
 
     /**
      * The default chunk size for upload. Currently set to 5 MiB.
@@ -83,7 +83,7 @@ public class ChunkedUploadProvider<UploadType> {
     /**
      * The upload response handler
      */
-    private final ChunkedUploadResponseHandler<UploadType> responseHandler;
+    private final LargeFileUploadResponseHandler<UploadType> responseHandler;
 
     /**
      * The counter for how many bytes have been read from input stream
@@ -99,7 +99,7 @@ public class ChunkedUploadProvider<UploadType> {
      * @param streamSize      the stream size
      * @param uploadTypeClass the upload type class
      */
-    public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
+    public LargeFileUploadTask(@Nonnull final IUploadSession uploadSession,
                                  @Nonnull final IBaseClient<?> client,
                                  @Nonnull final InputStream inputStream,
                                  final long streamSize,
@@ -115,7 +115,7 @@ public ChunkedUploadProvider(@Nonnull final IUploadSession uploadSession,
         this.inputStream = Objects.requireNonNull(inputStream, "Input stream is null.");
         this.streamSize = streamSize;
         this.uploadUrl = uploadSession.getUploadUrl();
-        this.responseHandler = new ChunkedUploadResponseHandler<UploadType>(uploadTypeClass, uploadSession.getClass());
+        this.responseHandler = new LargeFileUploadResponseHandler<UploadType>(uploadTypeClass, uploadSession.getClass());
     }
 
     /**
@@ -159,10 +159,10 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable
                 buffRead += read;
             }
 
-            final ChunkedUploadRequest<UploadType> request =
-                    new ChunkedUploadRequest<>(this.uploadUrl, this.client, options, buffer, buffRead,
+            final LargeFileUploadRequest<UploadType> request =
+                    new LargeFileUploadRequest<>(this.uploadUrl, this.client, options, buffer, buffRead,
                             this.readSoFar, this.streamSize);
-            final ChunkedUploadResult<UploadType> result = request.upload(this.responseHandler);
+            final LargeFileUploadResult<UploadType> result = request.upload(this.responseHandler);
             // TODO: upload should return a future, use sendfuture instead and the futures should be chained with completableFuture.then apply
 
             if (result.uploadCompleted()) {

From ff4c5401a63137fbadbec1ffd8f3b1d4bb4273bd Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Mon, 1 Mar 2021 15:11:44 -0500
Subject: [PATCH 208/213] - remove references to native http type in interfaces
 - removes useless method in interface - adds result wrapper for consumers for
 large file uploads

---
 .../graph/http/CoreHttpProvider.java          |   5 -
 .../graph/http/IStatefulResponseHandler.java  |  14 +-
 .../graph/tasks/LargeFileUploadRequest.java   |  14 +-
 .../graph/tasks/LargeFileUploadResponse.java  | 163 ++++++++++++++++++
 .../tasks/LargeFileUploadResponseHandler.java |  57 +++---
 .../graph/tasks/LargeFileUploadResult.java    | 130 +-------------
 .../graph/tasks/LargeFileUploadTask.java      |  43 +++--
 7 files changed, 227 insertions(+), 199 deletions(-)
 create mode 100644 src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java

diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 3ee61dea2..59d6b04c4 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -404,11 +404,6 @@ private <Result, Body, DeserializeType> Result processResponse(final Response re
 
                 // Call being executed
 
-
-                if (handler != null) {
-                    handler.configConnection(response);
-                }
-
                 logger.logDebug(String.format(Locale.ROOT, "Response code %d, %s",
                         response.code(),
                         response.message()));
diff --git a/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java b/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java
index b4343def5..893691a86 100644
--- a/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/http/IStatefulResponseHandler.java
@@ -29,8 +29,6 @@
 import javax.annotation.Nullable;
 import javax.annotation.Nonnull;
 
-import okhttp3.Response;
-
 /**
  * The handler interface for requests having stateful response from server.
  * The handler will custom the HTTP connection if needed and generate request
@@ -40,13 +38,6 @@
  * @param <DeserializedType> the deserialize type for serializer
  */
 public interface IStatefulResponseHandler<ResultType, DeserializedType> {
-    /**
-     * Configure the response
-     *
-     * @param response the HTTP response
-     */
-    void configConnection(@Nonnull final Response response);
-    
     /**
      * Generate result after receiving response
      *
@@ -54,12 +45,13 @@ public interface IStatefulResponseHandler<ResultType, DeserializedType> {
      * @param response the HTTP connection
      * @param serializer the serializer for parsing response
      * @param logger     the logger
+     * @param <ResponseType> the native http client response type
      * @return           the result generated by this handler
      * @throws Exception an exception occurs if the request was unable to complete for any reason
      */
     @Nullable
-    ResultType generateResult(@Nonnull final IHttpRequest request,
-                              @Nonnull final Response response,
+    <ResponseType> ResultType generateResult(@Nonnull final IHttpRequest request,
+                              @Nonnull final ResponseType response,
                               @Nonnull final ISerializer serializer,
                               @Nonnull final ILogger logger) throws Exception;
 }
diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java
index fac314089..286c10d1a 100644
--- a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadRequest.java
@@ -21,7 +21,7 @@
  * The chunk upload request.
  * @param <UploadType>    The upload item type.
  */
-public class LargeFileUploadRequest<UploadType> {
+class LargeFileUploadRequest<UploadType> {
 
     /**
      * Content Range header name.
@@ -41,7 +41,7 @@ public class LargeFileUploadRequest<UploadType> {
     /**
      * The base request.
      */
-    private final BaseRequest<LargeFileUploadResult<UploadType>> baseRequest;
+    private final BaseRequest<LargeFileUploadResponse<UploadType>> baseRequest;
 
     /**
      * Construct the ChunkedUploadRequest
@@ -67,7 +67,7 @@ protected LargeFileUploadRequest(@Nonnull final String requestUrl,
         Objects.requireNonNull(chunk, "parameter chunk cannot be null");
         this.data = new byte[chunkSize];
         System.arraycopy(chunk, 0, this.data, 0, chunkSize);
-        this.baseRequest = new BaseRequest<LargeFileUploadResult<UploadType>>(requestUrl, client, options, (Class<? extends LargeFileUploadResult<UploadType>>)(new LargeFileUploadResult<>((UploadType)null)).getClass()) {
+        this.baseRequest = new BaseRequest<LargeFileUploadResponse<UploadType>>(requestUrl, client, options, (Class<? extends LargeFileUploadResponse<UploadType>>)(new LargeFileUploadResponse<>((UploadType)null)).getClass()) {
         };
         this.baseRequest.setHttpMethod(HttpMethod.PUT);
         this.baseRequest.addHeader(CONTENT_RANGE_HEADER_NAME,
@@ -86,16 +86,16 @@ protected LargeFileUploadRequest(@Nonnull final String requestUrl,
      */
     @SuppressWarnings("unchecked")
     @Nonnull
-    public LargeFileUploadResult<UploadType> upload(
+    public LargeFileUploadResponse<UploadType> upload(
             @Nonnull final LargeFileUploadResponseHandler<UploadType> responseHandler) {
         Objects.requireNonNull(responseHandler, "parameter responseHandler cannot be null");
-        LargeFileUploadResult<UploadType> result = null;
+        LargeFileUploadResponse<UploadType> result = null;
 
         try {
             result = this.baseRequest
                     .getClient()
                     .getHttpProvider()
-                    .send(baseRequest, (Class<LargeFileUploadResult<UploadType>>)(Class<?>) LargeFileUploadResult.class, this.data, responseHandler);
+                    .send(baseRequest, (Class<LargeFileUploadResponse<UploadType>>)(Class<?>) LargeFileUploadResponse.class, this.data, responseHandler);
         } catch (final ClientException e) {
             throw new ClientException("Request failed with error, retry if necessary.", e);
         }
@@ -103,7 +103,7 @@ public LargeFileUploadResult<UploadType> upload(
         if (result != null && result.chunkCompleted()) {
             return result;
         } else
-            return new LargeFileUploadResult<UploadType>(
+            return new LargeFileUploadResponse<UploadType>(
                 new ClientException("Upload session failed.", result == null ? null : result.getError()));
     }
 }
diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java
new file mode 100644
index 000000000..bbf2a53a4
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java
@@ -0,0 +1,163 @@
+// ------------------------------------------------------------------------------
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
+// ------------------------------------------------------------------------------
+
+package com.microsoft.graph.tasks;
+
+import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.http.GraphServiceException;
+
+import javax.annotation.Nullable;
+
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+/**
+ * Wrapper class for different upload response from server.
+ */
+class LargeFileUploadResponse<UploadType> {
+    /**
+     * The location header from the response if provided
+     */
+    private final String location;
+    /**
+     * The uploaded item response.
+     */
+    private final UploadType uploadedItem;
+
+    /**
+     * The next session response.
+     */
+    private final IUploadSession session;
+
+    /**
+     * The error happened during upload.
+     */
+    private final ClientException error;
+
+    /**
+     * Constructs response with the location header.
+     *
+     * @param location The location returned by the response
+     */
+    protected LargeFileUploadResponse(@Nullable final String location) {
+        this.location = location;
+        this.error = null;
+        this.session = null;
+        this.uploadedItem = null;
+    }
+
+    /**
+     * Construct response with item created.
+     *
+     * @param uploaded The created item.
+     */
+    protected LargeFileUploadResponse(@Nullable final UploadType uploaded) {
+        this.uploadedItem = uploaded;
+        this.session = null;
+        this.error = null;
+        this.location = null;
+    }
+
+    /**
+     * Construct response with next session.
+     *
+     * @param session The next session.
+     */
+    protected LargeFileUploadResponse(@Nullable final IUploadSession session) {
+        this.session = session;
+        this.uploadedItem = null;
+        this.error = null;
+        this.location = null;
+    }
+
+    /**
+     * Construct response with error.
+     *
+     * @param error The error occurred during uploading.
+     */
+    protected LargeFileUploadResponse(@Nullable final ClientException error) {
+        this.error = error;
+        this.uploadedItem = null;
+        this.session = null;
+        this.location = null;
+    }
+
+    /**
+     * Construct response with server exception.
+     *
+     * @param exception The exception received from server.
+     */
+    protected LargeFileUploadResponse(@Nonnull final GraphServiceException exception) {
+        this(new ClientException(Objects
+                                .requireNonNull(exception, "parameter exception cannot be null")
+                                .getMessage(/* verbose */ true),
+                                exception));
+    }
+
+    /**
+     * Checks the large upload range is completed.
+     *
+     * @return true if current large upload range is completed.
+     */
+    public boolean chunkCompleted() {
+        return this.uploadedItem != null || this.session != null;
+    }
+
+    /**
+     * Checks the whole upload is completed.
+     *
+     * @return true if the response is an item.
+     */
+    public boolean uploadCompleted() {
+        return this.uploadedItem != null || this.location != null;
+    }
+
+    /**
+     * Checks if an error happened.
+     *
+     * @return true if current request has error.
+     */
+    public boolean hasError() {
+        return this.error != null;
+    }
+
+    /**
+     * Get the uploaded item.
+     *
+     * @return The item.
+     */
+    @Nullable
+    public UploadType getItem() {
+        return this.uploadedItem;
+    }
+
+    /**
+     * Get the next session.
+     *
+     * @return The next session for uploading.
+     */
+    @Nullable
+    public IUploadSession getSession() {
+        return this.session;
+    }
+
+    /**
+     * Get the error.
+     *
+     * @return The error.
+     */
+    @Nullable
+    public ClientException getError() {
+        return this.error;
+    }
+    /**
+     * Get the location.
+     * @return The location.
+     */
+    @Nullable
+    public String getLocation () {
+        return this.location;
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java
index 40ab93779..9d28bbdb4 100644
--- a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponseHandler.java
@@ -51,8 +51,8 @@
  *
  * @param <UploadType> the expected uploaded item
  */
-public class LargeFileUploadResponseHandler<UploadType>
-		implements IStatefulResponseHandler<LargeFileUploadResult<UploadType>, UploadType> {
+class LargeFileUploadResponseHandler<UploadType>
+		implements IStatefulResponseHandler<LargeFileUploadResponse<UploadType>, UploadType> {
 	/**
 	 * The expected deserialized upload type
 	 */
@@ -70,64 +70,49 @@ protected LargeFileUploadResponseHandler(@Nonnull final Class<UploadType> upload
         this.uploadSessionClass = Objects.requireNonNull(uploadSessionType, "parameter uploadSessionType cannot be null");
 	}
 
-	/**
-	 * Do nothing before getting the response
-	 *
-	 * @param response The response
-	 */
-	@Override
-	public void configConnection(@Nonnull final Response response) {
-		return;
-	}
-
-	/**
-	 * Generate the chunked upload response result
-	 *
-	 * @param request	the HTTP request
-	 * @param response the HTTP response
-	 * @param serializer the serializer
-	 * @param logger	 the system logger
-	 * @return the chunked upload result, which could be either an uploaded item or error
-	 * @throws Exception an exception occurs if the request was unable to complete for any reason
-	 */
 	@Override
 	@Nullable
-	public LargeFileUploadResult<UploadType> generateResult(
+	public <ResponseType> LargeFileUploadResponse<UploadType> generateResult(
 			@Nonnull final IHttpRequest request,
-			@Nonnull final Response response,
+			@Nonnull final ResponseType response,
 			@Nonnull final ISerializer serializer,
 			@Nonnull final ILogger logger) throws Exception {
         Objects.requireNonNull(request, "parameter request cannot be null");
         Objects.requireNonNull(response, "parameter response cannot be null");
         Objects.requireNonNull(serializer, "parameter serializer cannot be null");
         Objects.requireNonNull(logger, "parameter logger cannot be null");
-		if (response.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
+		if(!(response instanceof Response)) {
+            throw new ClientException("unsupported response type", null);
+        }
+        final Response nativeResponse = (Response)response;
+
+        if (nativeResponse.code() >= HttpResponseCode.HTTP_CLIENT_ERROR) {
 			logger.logDebug("Receiving error during upload, see detail on result error");
 
-			return new LargeFileUploadResult<>(
+			return new LargeFileUploadResponse<>(
 					GraphServiceException.createFromResponse(request, null, serializer,
-							response, logger));
-		} else if (response.code() >= HTTP_OK
-				&& response.code() < HttpResponseCode.HTTP_MULTIPLE_CHOICES) {
-            try(final ResponseBody body = response.body()) {
-                final String location = response.headers().get("Location");
+                    nativeResponse, logger));
+		} else if (nativeResponse.code() >= HTTP_OK
+				&& nativeResponse.code() < HttpResponseCode.HTTP_MULTIPLE_CHOICES) {
+            try(final ResponseBody body = nativeResponse.body()) {
+                final String location = nativeResponse.headers().get("Location");
                 final MediaType contentType = body.contentType();
                 final String subType = contentType == null ? null : contentType.subtype();
                 if (subType != null && subType.contains("json")) {
                     return parseJsonUploadResult(body, serializer, logger);
                 } else if (location != null) {
                     logger.logDebug("Upload session is completed (Outlook), uploaded item returned.");
-                    return new LargeFileUploadResult<>(this.deserializeTypeClass.getDeclaredConstructor().newInstance());
+                    return new LargeFileUploadResponse<>(location);
                 } else {
                     logger.logDebug("Upload session returned an unexpected response");
                 }
             }
 		}
-		return new LargeFileUploadResult<>(new ClientException("Received an unexpected response from the service, response code: " + response.code(), null));
+		return new LargeFileUploadResponse<>(new ClientException("Received an unexpected response from the service, response code: " + nativeResponse.code(), null));
 	}
 
 	@Nonnull
-	private LargeFileUploadResult<UploadType> parseJsonUploadResult(@Nonnull final ResponseBody responseBody, @Nonnull final ISerializer serializer, @Nonnull final ILogger logger) throws IOException {
+	private LargeFileUploadResponse<UploadType> parseJsonUploadResult(@Nonnull final ResponseBody responseBody, @Nonnull final ISerializer serializer, @Nonnull final ILogger logger) throws IOException {
 		try (final InputStream in = responseBody.byteStream()) {
 			final byte[] responseBytes = ByteStreams.toByteArray(in);
 			final IUploadSession session = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), uploadSessionClass);
@@ -135,10 +120,10 @@ private LargeFileUploadResult<UploadType> parseJsonUploadResult(@Nonnull final R
 			if (session == null || session.getNextExpectedRanges() == null) {
 				logger.logDebug("Upload session is completed (ODSP), uploaded item returned.");
 				final UploadType uploadedItem = serializer.deserializeObject(new ByteArrayInputStream(responseBytes), this.deserializeTypeClass);
-				return new LargeFileUploadResult<>(uploadedItem);
+				return new LargeFileUploadResponse<>(uploadedItem);
 			} else {
 				logger.logDebug("Chunk bytes has been accepted by the server.");
-				return new LargeFileUploadResult<>(session);
+				return new LargeFileUploadResponse<>(session);
 			}
 		}
 	}
diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java
index 1d93a06fe..b1459adbc 100644
--- a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResult.java
@@ -1,136 +1,22 @@
-// ------------------------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
-// ------------------------------------------------------------------------------
-
 package com.microsoft.graph.tasks;
 
-import com.microsoft.graph.core.ClientException;
-import com.microsoft.graph.http.GraphServiceException;
-
 import javax.annotation.Nullable;
 
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 /**
- * Wrapper class for different upload response from server.
+ * Respresents the result of a large file upload task.
+ *
+ * @param <ResultType> type of the deserialized response.
  */
-public class LargeFileUploadResult<UploadType> {
-    /**
-     * The uploaded item response.
-     */
-    private final UploadType uploadedItem;
-
-    /**
-     * The next session response.
-     */
-    private final IUploadSession session;
-
-    /**
-     * The error happened during upload.
-     */
-    private final ClientException error;
-
-    /**
-     * Construct result with item created.
-     *
-     * @param uploaded The created item.
-     */
-    protected LargeFileUploadResult(@Nullable final UploadType uploaded) {
-        this.uploadedItem = uploaded;
-        this.session = null;
-        this.error = null;
-    }
-
-    /**
-     * Construct result with next session.
-     *
-     * @param session The next session.
-     */
-    protected LargeFileUploadResult(@Nullable final IUploadSession session) {
-        this.session = session;
-        this.uploadedItem = null;
-        this.error = null;
-    }
-
-    /**
-     * Construct result with error.
-     *
-     * @param error The error occurred during uploading.
-     */
-    protected LargeFileUploadResult(@Nullable final ClientException error) {
-        this.error = error;
-        this.uploadedItem = null;
-        this.session = null;
-    }
-
-    /**
-     * Construct result with server exception.
-     *
-     * @param exception The exception received from server.
-     */
-    protected LargeFileUploadResult(@Nonnull final GraphServiceException exception) {
-        this(new ClientException(Objects
-                                .requireNonNull(exception, "parameter exception cannot be null")
-                                .getMessage(/* verbose */ true),
-                                exception));
-    }
-
-    /**
-     * Checks the chunk upload is completed.
-     *
-     * @return true if current chunk upload is completed.
-     */
-    public boolean chunkCompleted() {
-        return this.uploadedItem != null || this.session != null;
-    }
-
-    /**
-     * Checks the whole upload is completed.
-     *
-     * @return true if the response is an item.
-     */
-    public boolean uploadCompleted() {
-        return this.uploadedItem != null;
-    }
-
-    /**
-     * Checks if an error happened.
-     *
-     * @return true if current request has error.
-     */
-    public boolean hasError() {
-        return this.error != null;
-    }
-
-    /**
-     * Get the uploaded item.
-     *
-     * @return The item.
-     */
-    @Nullable
-    public UploadType getItem() {
-        return this.uploadedItem;
-    }
-
+public class LargeFileUploadResult<ResultType> {
     /**
-     * Get the next session.
-     *
-     * @return The next session for uploading.
+     * Location response header value if provided.
      */
     @Nullable
-    public IUploadSession getSession() {
-        return this.session;
-    }
+    public String location;
 
     /**
-     * Get the error.
-     *
-     * @return The error.
+     * Deserialized response body if the response has content.
      */
     @Nullable
-    public ClientException getError() {
-        return this.error;
-    }
+    public ResultType responseBody;
 }
diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
index 7db50f8a2..0316d93cd 100644
--- a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
@@ -128,7 +128,7 @@ public LargeFileUploadTask(@Nonnull final IUploadSession uploadSession,
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
+    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
             throws IOException {
 
         int internalChunkSize = chunkSize;
@@ -162,33 +162,40 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable
             final LargeFileUploadRequest<UploadType> request =
                     new LargeFileUploadRequest<>(this.uploadUrl, this.client, options, buffer, buffRead,
                             this.readSoFar, this.streamSize);
-            final LargeFileUploadResult<UploadType> result = request.upload(this.responseHandler);
+            final LargeFileUploadResponse<UploadType> response = request.upload(this.responseHandler);
             // TODO: upload should return a future, use sendfuture instead and the futures should be chained with completableFuture.then apply
 
-            if (result.uploadCompleted()) {
+            if (response.uploadCompleted()) {
                 if(progressCallback != null) {
                     progressCallback.progress(this.streamSize, this.streamSize);
                 }
-                return completedFuture(result.getItem());
-            } else if (result.chunkCompleted()) {
+                final LargeFileUploadResult<UploadType> result = new LargeFileUploadResult<UploadType>();
+                if (response.getItem() != null) {
+                    result.responseBody = response.getItem();
+                }
+                if (response.getLocation() != null) {
+                    result.location = response.getLocation();
+                }
+                return completedFuture(result);
+            } else if (response.chunkCompleted()) {
                 if(progressCallback != null) {
                     progressCallback.progress(this.readSoFar, this.streamSize);
                 }
-            } else if (result.hasError()) {
-                return failedFuture(result.getError());
+            } else if (response.hasError()) {
+                return failedFuture(response.getError());
             }
 
             this.readSoFar += buffRead;
         }
         return failedFuture(new ClientException("Upload did not complete", null));
     }
-    private CompletableFuture<UploadType> completedFuture(final UploadType result) { // CompletableFuture.completedFuture(result.getItem()); missing on android
-        final CompletableFuture<UploadType> fut = new CompletableFuture<UploadType>();
+    private java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> completedFuture(final LargeFileUploadResult<UploadType> result) { // CompletableFuture.completedFuture(result.getItem()); missing on android
+        final CompletableFuture<LargeFileUploadResult<UploadType>> fut = new CompletableFuture<LargeFileUploadResult<UploadType>>();
         fut.complete(result);
         return fut;
     }
-    private CompletableFuture<UploadType> failedFuture(ClientException ex) { // CompletableFuture.failedFuture not available on android
-        final CompletableFuture<UploadType> fut = new CompletableFuture<UploadType>();
+    private java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> failedFuture(ClientException ex) { // CompletableFuture.failedFuture not available on android
+        final CompletableFuture<LargeFileUploadResult<UploadType>> fut = new CompletableFuture<LargeFileUploadResult<UploadType>>();
         fut.completeExceptionally(ex);
         return fut;
     }
@@ -200,7 +207,7 @@ private CompletableFuture<UploadType> failedFuture(ClientException ex) { // Comp
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync()
+    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync()
     				throws IOException {
     	return uploadAsync(0);
     }
@@ -212,7 +219,7 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync()
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable final int chunkSize)
+    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize)
     				throws IOException {
     	return uploadAsync(chunkSize, null);
     }
@@ -225,7 +232,7 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options)
+    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options)
     				throws IOException {
     	return uploadAsync(chunkSize, options, null);
     }
@@ -240,7 +247,7 @@ public java.util.concurrent.CompletableFuture<UploadType> uploadAsync(@Nullable
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
+    public LargeFileUploadResult<UploadType> upload(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
             throws IOException {
         try {
             return uploadAsync(chunkSize, options, progressCallback).get();
@@ -259,7 +266,7 @@ public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Opt
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Option> options)
+    public LargeFileUploadResult<UploadType> upload(@Nullable final int chunkSize, @Nullable final List<Option> options)
             throws IOException {
         return upload(chunkSize, options, null);
     }
@@ -271,7 +278,7 @@ public UploadType upload(@Nullable final int chunkSize, @Nullable final List<Opt
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public UploadType upload(@Nullable final int chunkSize)
+    public LargeFileUploadResult<UploadType> upload(@Nullable final int chunkSize)
             throws IOException {
         return upload(chunkSize, null);
     }
@@ -282,7 +289,7 @@ public UploadType upload(@Nullable final int chunkSize)
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public UploadType upload()
+    public LargeFileUploadResult<UploadType> upload()
             throws IOException {
         return upload(0);
     }

From aed7d1f85d871da1994c0eba49e1ba1d54e030ae Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 2 Mar 2021 08:36:19 -0500
Subject: [PATCH 209/213] - removes fully qualified names for
 completablefutures

---
 .../microsoft/graph/tasks/LargeFileUploadTask.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
index 0316d93cd..897cc6d0f 100644
--- a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadTask.java
@@ -128,7 +128,7 @@ public LargeFileUploadTask(@Nonnull final IUploadSession uploadSession,
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
+    public CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options, @Nullable final IProgressCallback progressCallback)
             throws IOException {
 
         int internalChunkSize = chunkSize;
@@ -189,12 +189,12 @@ public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>>
         }
         return failedFuture(new ClientException("Upload did not complete", null));
     }
-    private java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> completedFuture(final LargeFileUploadResult<UploadType> result) { // CompletableFuture.completedFuture(result.getItem()); missing on android
+    private CompletableFuture<LargeFileUploadResult<UploadType>> completedFuture(final LargeFileUploadResult<UploadType> result) { // CompletableFuture.completedFuture(result.getItem()); missing on android
         final CompletableFuture<LargeFileUploadResult<UploadType>> fut = new CompletableFuture<LargeFileUploadResult<UploadType>>();
         fut.complete(result);
         return fut;
     }
-    private java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> failedFuture(ClientException ex) { // CompletableFuture.failedFuture not available on android
+    private CompletableFuture<LargeFileUploadResult<UploadType>> failedFuture(ClientException ex) { // CompletableFuture.failedFuture not available on android
         final CompletableFuture<LargeFileUploadResult<UploadType>> fut = new CompletableFuture<LargeFileUploadResult<UploadType>>();
         fut.completeExceptionally(ex);
         return fut;
@@ -207,7 +207,7 @@ private java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync()
+    public CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync()
     				throws IOException {
     	return uploadAsync(0);
     }
@@ -219,7 +219,7 @@ public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>>
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize)
+    public CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize)
     				throws IOException {
     	return uploadAsync(chunkSize, null);
     }
@@ -232,7 +232,7 @@ public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>>
      * @throws IOException the IO exception that occurred during upload
      */
     @Nonnull
-    public java.util.concurrent.CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options)
+    public CompletableFuture<LargeFileUploadResult<UploadType>> uploadAsync(@Nullable final int chunkSize, @Nullable final List<Option> options)
     				throws IOException {
     	return uploadAsync(chunkSize, options, null);
     }

From 9cfcce3f424032247d71bbb8e9cbbd4dbcbcf5cb Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Thu, 4 Mar 2021 12:53:39 -0500
Subject: [PATCH 210/213] - fixes a bug where errors would log payload even on
 error verbosity

---
 .../graph/http/GraphServiceException.java     |  7 +------
 .../graph/tasks/LargeFileUploadResponse.java  |  2 +-
 .../http/GraphServiceExceptionTests.java      | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/GraphServiceException.java b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
index d2718f6d4..4e9725fad 100644
--- a/src/main/java/com/microsoft/graph/http/GraphServiceException.java
+++ b/src/main/java/com/microsoft/graph/http/GraphServiceException.java
@@ -274,12 +274,7 @@ public String getMessage(final boolean verbose) {
             if (verbose) {
                 sb.append(requestBody);
             } else {
-                final int bodyLength = Math.min(MAX_BREVITY_LENGTH, requestBody.length());
-                final String truncatedBody = requestBody.substring(0, bodyLength);
-                sb.append(truncatedBody);
-                if (truncatedBody.length() == MAX_BREVITY_LENGTH) {
-                    sb.append(TRUNCATION_MARKER);
-                }
+                sb.append(TRUNCATION_MARKER);
             }
         }
         sb.append(NEW_LINE).append(NEW_LINE);
diff --git a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java
index bbf2a53a4..ab839452b 100644
--- a/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java
+++ b/src/main/java/com/microsoft/graph/tasks/LargeFileUploadResponse.java
@@ -92,7 +92,7 @@ protected LargeFileUploadResponse(@Nullable final ClientException error) {
     protected LargeFileUploadResponse(@Nonnull final GraphServiceException exception) {
         this(new ClientException(Objects
                                 .requireNonNull(exception, "parameter exception cannot be null")
-                                .getMessage(/* verbose */ true),
+                                .getMessage(),
                                 exception));
     }
 
diff --git a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
index b2f577843..2e7bfff47 100644
--- a/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
+++ b/src/test/java/com/microsoft/graph/http/GraphServiceExceptionTests.java
@@ -74,4 +74,24 @@ public void testcreateFromResponse() throws IOException {
         String message = exception.getMessage();
         assertTrue(message.indexOf("http://localhost") > 0);
     }
+    @Test
+    public void requestPayloadShouldNotBePartOfMessageWhenNotVerbose(){
+        final GraphErrorResponse errorResponse = new GraphErrorResponse();
+        final GraphError error = new GraphError();
+        error.code = GraphErrorCodes.UNAUTHENTICATED.toString();
+        errorResponse.error = error;
+        final GraphServiceException exception = new GraphServiceException("GET","https://graph.microsoft.com/v1.0/me",new ArrayList<String>(),"requestPayload",401,"Unauthorized",new ArrayList<String>(),errorResponse, false);
+        final String message = exception.getMessage();
+        assertFalse(message.indexOf("requestPayload") > 0);
+    }
+    @Test
+    public void requestPayloadShouldBePartOfMessageWhenVerbose(){
+        final GraphErrorResponse errorResponse = new GraphErrorResponse();
+        final GraphError error = new GraphError();
+        error.code = GraphErrorCodes.UNAUTHENTICATED.toString();
+        errorResponse.error = error;
+        final GraphServiceException exception = new GraphServiceException("GET","https://graph.microsoft.com/v1.0/me",new ArrayList<String>(),"requestPayload",401,"Unauthorized",new ArrayList<String>(),errorResponse, true);
+        final String message = exception.getMessage();
+        assertTrue(message.indexOf("requestPayload") > 0);
+    }
 }

From 0c6f373e138ebc8229345ce69b6ec192e5072e49 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 9 Mar 2021 14:50:28 -0500
Subject: [PATCH 211/213] - fixes a bug where native EDM return types would not
 be deserialized properly

---
 .../serializer/EdmNativeTypeSerializer.java   | 60 +++++++++++++++
 .../graph/serializer/GsonFactory.java         | 72 ++++++++++++++++++
 .../EdmNativeTypeSerializerTests.java         | 76 +++++++++++++++++++
 3 files changed, 208 insertions(+)
 create mode 100644 src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
 create mode 100644 src/test/java/com/microsoft/graph/serializer/EdmNativeTypeSerializerTests.java

diff --git a/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java b/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
new file mode 100644
index 000000000..a8b50075b
--- /dev/null
+++ b/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
@@ -0,0 +1,60 @@
+package com.microsoft.graph.serializer;
+
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.microsoft.graph.logger.ILogger;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/** Deserializer for native EDM types from the service. Used for actions and functions that return native types for example. */
+public class EdmNativeTypeSerializer {
+    /**
+     * Deserializes native EDM types from the service. Used for actions and functions that return native types for example.
+     * @param <T> Expected return type.
+     * @param json json to deserialize.
+     * @param type class of the expected return type.
+     * @param logger logger to use.
+     * @return the deserialized type or null.
+     */
+    @Nullable
+    public static <T> T deserialize(@Nonnull final JsonElement json, @Nonnull final Class<T> type, @Nonnull final ILogger logger) {
+        if (json == null || type == null) {
+			return null;
+        } else if(json.isJsonPrimitive()) {
+            return getPrimitiveValue(json, type);
+		} else if(json.isJsonObject()) {
+            final JsonElement element = json.getAsJsonObject().get("@odata.null");
+            if(element != null && element.isJsonPrimitive()) {
+                return getPrimitiveValue(element, type);
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+    @SuppressWarnings("unchecked")
+    private static <T> T getPrimitiveValue(final JsonElement json, final Class<T> type) {
+        if(type == Boolean.class) {
+            return (T) Boolean.valueOf(json.getAsBoolean());
+        } else if(type == String.class) {
+            return (T)json.getAsString();
+        } else if(type == Integer.class) {
+            return (T) Integer.valueOf(json.getAsInt());
+        } else if(type == UUID.class) {
+            return (T) UUID.fromString(json.getAsString());
+        } else if(type == Long.class) {
+            return (T) Long.valueOf(json.getAsLong());
+        } else if (type == Float.class) {
+            return (T) Float.valueOf(json.getAsFloat());
+        } else if (type == BigDecimal.class) {
+            return (T) json.getAsBigDecimal();
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
index e51b998cf..d4da62625 100644
--- a/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
+++ b/src/main/java/com/microsoft/graph/serializer/GsonFactory.java
@@ -38,11 +38,13 @@
 
 import com.microsoft.graph.core.TimeOfDay;
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.GregorianCalendar;
+import java.util.UUID;
 
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.Duration;
@@ -254,8 +256,78 @@ public TimeOfDay deserialize(final JsonElement json,
             }
         };
 
+        final JsonDeserializer<Boolean> booleanJsonDeserializer = new JsonDeserializer<Boolean>() {
+            @Override
+            public Boolean deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Boolean.class, logger);
+            }
+        };
+
+        final JsonDeserializer<String> stringJsonDeserializer = new JsonDeserializer<String>() {
+            @Override
+            public String deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, String.class, logger);
+            }
+        };
+
+        final JsonDeserializer<BigDecimal> bigDecimalJsonDeserializer = new JsonDeserializer<BigDecimal>() {
+            @Override
+            public BigDecimal deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, BigDecimal.class, logger);
+            }
+        };
+
+        final JsonDeserializer<Integer> integerJsonDeserializer = new JsonDeserializer<Integer>() {
+            @Override
+            public Integer deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Integer.class, logger);
+            }
+        };
+
+        final JsonDeserializer<Long> longJsonDeserializer = new JsonDeserializer<Long>() {
+            @Override
+            public Long deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Long.class, logger);
+            }
+        };
+
+        final JsonDeserializer<UUID> uuidJsonDeserializer = new JsonDeserializer<UUID>() {
+            @Override
+            public UUID deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, UUID.class, logger);
+            }
+        };
+
+        final JsonDeserializer<Float> floatJsonDeserializer = new JsonDeserializer<Float>() {
+            @Override
+            public Float deserialize(final JsonElement json,
+                    final Type typeOfT,
+                    final JsonDeserializationContext context) throws JsonParseException {
+                    return EdmNativeTypeSerializer.deserialize(json, Float.class, logger);
+            }
+        };
+
         return new GsonBuilder()
                 .excludeFieldsWithoutExposeAnnotation()
+                .registerTypeAdapter(Boolean.class, booleanJsonDeserializer)
+                .registerTypeAdapter(String.class, stringJsonDeserializer)
+                .registerTypeAdapter(Float.class, floatJsonDeserializer)
+                .registerTypeAdapter(Integer.class, integerJsonDeserializer)
+                .registerTypeAdapter(BigDecimal.class, bigDecimalJsonDeserializer)
+                .registerTypeAdapter(UUID.class, uuidJsonDeserializer)
+                .registerTypeAdapter(Long.class, longJsonDeserializer)
                 .registerTypeAdapter(OffsetDateTime.class, calendarJsonSerializer)
                 .registerTypeAdapter(OffsetDateTime.class, calendarJsonDeserializer)
                 .registerTypeAdapter(GregorianCalendar.class, calendarJsonSerializer)
diff --git a/src/test/java/com/microsoft/graph/serializer/EdmNativeTypeSerializerTests.java b/src/test/java/com/microsoft/graph/serializer/EdmNativeTypeSerializerTests.java
new file mode 100644
index 000000000..952fe422a
--- /dev/null
+++ b/src/test/java/com/microsoft/graph/serializer/EdmNativeTypeSerializerTests.java
@@ -0,0 +1,76 @@
+package com.microsoft.graph.serializer;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
+import java.util.UUID;
+
+import com.microsoft.graph.logger.DefaultLogger;
+
+import org.junit.jupiter.api.Test;
+
+public class EdmNativeTypeSerializerTests {
+    @Test
+    public void testBoolean() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":true}";
+        final Boolean result = serializer.deserializeObject(source, Boolean.class);
+
+        assertEquals(Boolean.valueOf(true), result);
+    }
+    @Test
+    public void testInteger() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
+        final Integer result = serializer.deserializeObject(source, Integer.class);
+
+        assertEquals(Integer.valueOf(12), result);
+    }
+    @Test
+    public void testString() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":\"toto\"}";
+        final String result = serializer.deserializeObject(source, String.class);
+
+        assertEquals("toto", result);
+    }
+    @Test
+    public void testFloat() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12.5}";
+        final Float result = serializer.deserializeObject(source, Float.class);
+
+        assertEquals(Float.valueOf("12.5"), result);
+    }
+    @Test
+    public void testLong() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
+        final Long result = serializer.deserializeObject(source, Long.class);
+
+        assertEquals(Long.valueOf(12), result);
+    }
+    @Test
+    public void testBigDecimal() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":12}";
+        final BigDecimal result = serializer.deserializeObject(source, BigDecimal.class);
+
+        assertEquals(BigDecimal.valueOf(12), result);
+    }
+    @Test
+    public void testUUID() throws Exception {
+        final DefaultSerializer serializer = new DefaultSerializer(new DefaultLogger());
+
+        final String source = "{\"@odata.context\":\"https://graph.microsoft.com/v1.0/$metadata#Edm.Null\",\"@odata.null\":\"0E6558C3-9640-4385-860A-2A894AC5C246\"}";
+        final UUID result = serializer.deserializeObject(source, UUID.class);
+
+        assertEquals(UUID.fromString("0E6558C3-9640-4385-860A-2A894AC5C246"), result);
+    }
+}

From b9b566c72ebef166d87c8a2cb19aac05be02b929 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Tue, 9 Mar 2021 14:50:58 -0500
Subject: [PATCH 212/213] - fixes a bug where the content type for requests
 with empty bodies would be wrongfully defaulted

---
 .../graph/http/CoreHttpProvider.java          | 12 +++---
 .../graph/http/CoreHttpProviderTests.java     | 43 +++++++++++++++++--
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
index 59d6b04c4..3fb14b462 100644
--- a/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
+++ b/src/main/java/com/microsoft/graph/http/CoreHttpProvider.java
@@ -268,11 +268,7 @@ public <Result, Body> Request getHttpRequest(@Nonnull final IHttpRequest request
 			// This ensures that the Content-Length header is properly set
 			if (request.getHttpMethod() == HttpMethod.POST) {
 				bytesToWrite = new byte[0];
-				if(contenttype == null) {
-					contenttype = BINARY_CONTENT_TYPE;
-				}
-			}
-			else {
+			} else {
 				bytesToWrite = null;
 			}
 		} else if (serializable instanceof byte[]) {
@@ -329,7 +325,11 @@ public void writeTo(BufferedSink sink) throws IOException {
 
 				@Override
 				public MediaType contentType() {
-					return MediaType.parse(mediaContentType);
+                    if(mediaContentType == null || mediaContentType.isEmpty()) {
+                        return null;
+                    } else {
+					    return MediaType.parse(mediaContentType);
+                    }
 				}
 			};
 		}
diff --git a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
index 5e9309cfc..2a3c931e0 100644
--- a/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
+++ b/src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java
@@ -8,9 +8,11 @@
 import com.google.gson.JsonPrimitive;
 
 import com.microsoft.graph.core.GraphErrorCodes;
+import com.microsoft.graph.core.IBaseClient;
 import com.microsoft.graph.logger.ILogger;
 import com.microsoft.graph.logger.LoggerLevel;
 import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
 import com.microsoft.graph.serializer.DefaultSerializer;
 import com.microsoft.graph.serializer.ISerializer;
 
@@ -21,7 +23,9 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 import okhttp3.Call;
 import okhttp3.MediaType;
@@ -33,6 +37,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
@@ -63,14 +68,14 @@ public void testErrorResponse() throws Exception {
             mProvider.send(mRequest, Object.class, null);
             fail("Expected exception in previous statement");
         } catch (final GraphServiceException e) {
-        	assertTrue(e.getMessage().indexOf("truncated") > 0);
+            assertTrue(e.getMessage().indexOf("truncated") > 0);
             assertEquals(expectedMessage, e.getServiceError().message);
         }
     }
 
     @Test
     public void testVerboseErrorResponse() throws Exception {
-    	final GraphErrorCodes expectedErrorCode = GraphErrorCodes.INVALID_REQUEST;
+        final GraphErrorCodes expectedErrorCode = GraphErrorCodes.INVALID_REQUEST;
         final String expectedMessage = "Test error!";
         final GraphErrorResponse toSerialize = new GraphErrorResponse();
         toSerialize.error = new GraphError();
@@ -97,8 +102,8 @@ public void testVerboseErrorResponse() throws Exception {
             mProvider.send(mRequest, Object.class, null);
             fail("Expected exception in previous statement");
         } catch (final GraphServiceException e) {
-        	assertFalse(e.getMessage().indexOf("truncated") > 0);
-        	assertTrue(e.getMessage().indexOf("The raw request was invalid") < 0);
+            assertFalse(e.getMessage().indexOf("truncated") > 0);
+            assertTrue(e.getMessage().indexOf("The raw request was invalid") < 0);
         }
     }
 
@@ -139,6 +144,36 @@ public void testStreamToStringReturnsEmpty() {
         String convertedData = CoreHttpProvider.streamToString(inputStream);
         assertEquals("", convertedData);
     }
+    @Test
+    public void emptyPostContentTypeIsNotReset() {
+        final String contentTypeValue = "application/json";
+        final HeaderOption ctype = new HeaderOption("Content-Type", contentTypeValue);
+        final ArrayList<Option> options = new ArrayList<>();
+        options.add(ctype);
+        final IHttpRequest absRequest = new BaseRequest<String>("https://localhost", mock(IBaseClient.class), options, String.class) {{
+            this.setHttpMethod(HttpMethod.POST);
+        }};
+        final ISerializer serializer = mock(ISerializer.class);
+        final ILogger logger = mock(ILogger.class);
+        mProvider = new CoreHttpProvider(serializer,
+                logger,
+                new OkHttpClient.Builder().build());
+        final Request request = mProvider.getHttpRequest(absRequest, String.class, null);
+        assertEquals(contentTypeValue, request.body().contentType().toString());
+    }
+    @Test
+    public void emptyPostContentTypeIsNotSet() {
+        final IHttpRequest absRequest = new BaseRequest<String>("https://localhost", mock(IBaseClient.class), Collections.emptyList(), String.class) {{
+            this.setHttpMethod(HttpMethod.POST);
+        }};
+        final ISerializer serializer = mock(ISerializer.class);
+        final ILogger logger = mock(ILogger.class);
+        mProvider = new CoreHttpProvider(serializer,
+                logger,
+                new OkHttpClient.Builder().build());
+        final Request request = mProvider.getHttpRequest(absRequest, String.class, null);
+        assertNull(request.body().contentType());
+    }
 
 
     /**

From b812269ea77f2df25d56b9e00873b5f24211f8bd Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 10 Mar 2021 08:23:33 -0500
Subject: [PATCH 213/213] =?UTF-8?q?-=20indent=20is=20evil=20=F0=9F=98=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../microsoft/graph/serializer/EdmNativeTypeSerializer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java b/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
index a8b50075b..5871ac4e4 100644
--- a/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
+++ b/src/main/java/com/microsoft/graph/serializer/EdmNativeTypeSerializer.java
@@ -24,10 +24,10 @@ public class EdmNativeTypeSerializer {
     @Nullable
     public static <T> T deserialize(@Nonnull final JsonElement json, @Nonnull final Class<T> type, @Nonnull final ILogger logger) {
         if (json == null || type == null) {
-			return null;
+            return null;
         } else if(json.isJsonPrimitive()) {
             return getPrimitiveValue(json, type);
-		} else if(json.isJsonObject()) {
+        } else if(json.isJsonObject()) {
             final JsonElement element = json.getAsJsonObject().get("@odata.null");
             if(element != null && element.isJsonPrimitive()) {
                 return getPrimitiveValue(element, type);