- fixes a bug where downloading json files from onedrive would cause a cast exception

Author: baywet

src/main/java/com/microsoft/graph/core/Constants.java

@@ -17,6 +17,10 @@ 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 
 	 */

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

@@ -417,20 +417,20 @@ public Request authenticateRequest(Request request) {
 
 				final Map<String, String> headers = CoreHttpProvider.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 && contentType.contains(Constants.JSON_CONTENT_TYPE)) {
+				if (contentType != null && resultClass != InputStream.class && 
+							(contentType.contains(Constants.JSON_CONTENT_TYPE) || contentType.contains(Constants.TEXT_CONTENT_TYPE))) { // some services reply in text/plain with a JSON representation...
 					logger.logDebug("Response json");
 					return handleJsonResponse(in, CoreHttpProvider.getResponseHeadersAsMapOfStringList(response), resultClass);
-				} else {
+				} else if (resultClass == InputStream.class) {
 					logger.logDebug("Response binary");
 					isBinaryStreamInput = true;
-					if (resultClass == InputStream.class) {
-						return (Result) handleBinaryStream(in);
-					} else if(response.body() != null && response.body().contentLength() > 0) { // some services reply in text/plain with a JSON representation...
-						return handleJsonResponse(in, CoreHttpProvider.getResponseHeadersAsMapOfStringList(response), resultClass);
-					} else {
-						return (Result) null;
-					}
+					return (Result) handleBinaryStream(in);
+				} else {
+					return (Result) null;
 				}
 			} finally {
 				if (!isBinaryStreamInput) {

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

@@ -1,6 +1,7 @@
 package com.microsoft.graph.functional;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,6 +14,7 @@
 import com.microsoft.graph.concurrency.ChunkedUploadProvider;
 import com.microsoft.graph.concurrency.IProgressCallback;
 import com.microsoft.graph.core.ClientException;
+import com.microsoft.graph.http.CoreHttpProvider;
 import com.microsoft.graph.models.extensions.DriveItem;
 import com.microsoft.graph.models.extensions.DriveItemUploadableProperties;
 import com.microsoft.graph.models.extensions.UploadSession;
@@ -85,4 +87,18 @@ public void testDownloadWithCustomRequest() throws IOException {
 		   assertFalse("stream should not be empty", stream.read() == -1);
 		}
 	}
+	@Test
+	public void downloadJsonFileFromOneDrive() throws Exception {
+		final InputStream stream = testBase.graphClient.me()
+		.drive()
+		.root()
+		.itemWithPath("test.json")
+		.content()
+		.buildRequest()
+		.get();
+
+		final String fileContent = CoreHttpProvider.streamToString(stream);
+
+		assertTrue(fileContent.length() > 0);
+	}
 }