Merge branch 'dev' into bugfix/retry-connection-errors

Author: baywet

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

@@ -260,7 +260,9 @@ public <Result, Body> Request getHttpRequest(final IHttpRequest request,
 			// This ensures that the Content-Length header is properly set
 			if (request.getHttpMethod() == HttpMethod.POST) {
 				bytesToWrite = new byte[0];
-				contenttype = Constants.BINARY_CONTENT_TYPE;
+				if(contenttype == null) {
+					contenttype = Constants.BINARY_CONTENT_TYPE;
+				}
 			}
 			else {
 				bytesToWrite = null;

src/test/java/com/microsoft/graph/functional/UserTests.java

@@ -1,11 +1,13 @@
 package com.microsoft.graph.functional;
 
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -15,11 +17,16 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
+import okhttp3.Request;
+
+import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.models.extensions.Drive;
 import com.microsoft.graph.models.extensions.DriveItem;
 import com.microsoft.graph.models.extensions.IGraphServiceClient;
 import com.microsoft.graph.models.extensions.ProfilePhoto;
 import com.microsoft.graph.models.extensions.User;
+import com.microsoft.graph.options.HeaderOption;
+import com.microsoft.graph.options.Option;
 import com.microsoft.graph.requests.extensions.IContactCollectionPage;
 import com.microsoft.graph.requests.extensions.IDirectoryObjectCollectionWithReferencesPage;
 import com.microsoft.graph.requests.extensions.IDriveItemCollectionPage;
@@ -188,4 +195,18 @@ public void run() {
 		}
 	}
 
+	@Test
+	public void emptyPostContentType() {
+		final String contentTypeValue = "application/json";
+		final HeaderOption ctype = new HeaderOption("Content-Type", contentTypeValue);
+        final ArrayList<Option> options = new ArrayList<>();
+        options.add(ctype);
+        final Request request = graphServiceClient.me()
+                                            .revokeSignInSessions()
+                                            .buildRequest(options)
+                                            .withHttpMethod(HttpMethod.POST)
+                                            .getHttpRequest();
+		assertEquals(contentTypeValue, request.body().contentType().toString());					
+	}
+
 }