- fixes a bug where null content on post request would have a wrong application/octet-stream content type

Author: baywet

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

@@ -243,7 +243,7 @@ public <Result, Body> Request getHttpRequest(final IHttpRequest request,
 		if(this.connectionConfig == null) {
 			this.connectionConfig = new DefaultConnectionConfig();
 		}
-		
+
 		// Request level middleware options
 		RedirectOptions redirectOptions = new RedirectOptions(request.getMaxRedirects() > 0? request.getMaxRedirects() : this.connectionConfig.getMaxRedirects(),
 				request.getShouldRedirect() != null? request.getShouldRedirect() : this.connectionConfig.getShouldRedirect());
@@ -256,7 +256,7 @@ public <Result, Body> Request getHttpRequest(final IHttpRequest request,
 				.newBuilder()
 				.tag(RedirectOptions.class, redirectOptions)
 				.tag(RetryOptions.class, retryOptions);
-		
+
 		String contenttype = null;
 
 		logger.logDebug("Request Method " + request.getHttpMethod().toString());
@@ -276,11 +276,7 @@ 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];
-				if(contenttype == null) {
-					contenttype = Constants.BINARY_CONTENT_TYPE;
-				}
-			}
-			else {
+			} else {
 				bytesToWrite = null;
 			}
 		} else if (serializable instanceof byte[]) {
@@ -341,7 +337,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);
+                    }
 				}
 			};
 		}
@@ -401,7 +401,7 @@ public Request authenticateRequest(Request request) {
 			try {
 
 				// Call being executed
-				
+
 
 				if (handler != null) {
 					handler.configConnection(response);
@@ -425,7 +425,7 @@ public Request authenticateRequest(Request request) {
 
 				if (response.code() == HttpResponseCode.HTTP_NOBODY
 						|| response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
-					logger.logDebug("Handling response with no body");                  
+					logger.logDebug("Handling response with no body");
 					return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
 				}
 
@@ -442,7 +442,7 @@ public Request authenticateRequest(Request request) {
 					return (Result) null;
 
 				final String contentType = headers.get(Constants.CONTENT_TYPE_HEADER_NAME);
-				if (contentType != null && resultClass != InputStream.class && 
+				if (contentType != null && resultClass != InputStream.class &&
 							contentType.contains(Constants.JSON_CONTENT_TYPE)) {
 					logger.logDebug("Response json");
 					return handleJsonResponse(in, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
@@ -534,12 +534,12 @@ private <Result> Result handleJsonResponse(final InputStream in, Map<String, Lis
 
 	/**
 	 * 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) 
+	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));

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

@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -160,7 +161,7 @@ public void meInsightsUsed() {
 		IUsedInsightCollectionPage usedInsightCollectionPage = graphServiceClient.me().insights().used().buildRequest().get();
 		assertNotNull(usedInsightCollectionPage);
 	}
-	
+
 	@Test
 	public void mailFoldertest() {
 		//GET me/mailFolders
@@ -172,7 +173,7 @@ public void mailFoldertest() {
 			assertNotNull(messageCollectionPage);
 		}
 	}
-	
+
 	@Test
 	public void meMemberof() {
 		IDirectoryObjectCollectionWithReferencesPage page = graphServiceClient.me().memberOf().buildRequest().get();
@@ -201,7 +202,7 @@ public void run() {
 	}
 
 	@Test
-	public void emptyPostContentType() {
+	public void emptyPostContentTypeIsNotReset() {
 		final String contentTypeValue = "application/json";
 		final HeaderOption ctype = new HeaderOption("Content-Type", contentTypeValue);
         final ArrayList<Option> options = new ArrayList<>();
@@ -211,7 +212,16 @@ public void emptyPostContentType() {
                                             .buildRequest(options)
                                             .withHttpMethod(HttpMethod.POST)
                                             .getHttpRequest();
-		assertEquals(contentTypeValue, request.body().contentType().toString());					
+		assertEquals(contentTypeValue, request.body().contentType().toString());
+	}
+    @Test
+	public void emptyPostContentTypeIsNotSet() {
+        final Request request = graphServiceClient.me()
+                                            .revokeSignInSessions()
+                                            .buildRequest()
+                                            .withHttpMethod(HttpMethod.POST)
+                                            .getHttpRequest();
+		assertNull(request.body().contentType());
 	}
 	@Test
 	public void castTest() {