Merge pull request #470 from microsoftgraph/bugfix/odsp-json-file-download

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

Author: baywet

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

@@ -419,20 +419,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)) {
 					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,18 +1,23 @@
 package com.microsoft.graph.functional;
 
 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.nio.charset.StandardCharsets;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import com.google.gson.JsonPrimitive;
 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;
@@ -25,7 +30,25 @@ public class OneDriveTests {
     public void setUp() {
        testBase = new TestBase();
     }
-    
+	
+	IProgressCallback<DriveItem> callback = new IProgressCallback<DriveItem> () {
+		@Override
+		public void progress(final long current, final long max) {
+			//Check progress
+		}
+		@Override
+		public void success(final DriveItem result) {
+			//Handle the successful response
+			String finishedItemId = result.id;
+			Assert.assertNotNull(finishedItemId);
+		}
+		
+		@Override
+		public void failure(final ClientException ex) {
+			//Handle the failed upload
+			Assert.fail("Upload session failed");
+		}
+	};
     /**
      * Test large file upload. 
      * https://github.com/OneDrive/onedrive-sdk-csharp/blob/master/docs/chunked-uploads.md
@@ -41,25 +64,6 @@ public void testLargeFileUpload() throws IOException, InterruptedException {
     	InputStream uploadFile = OneDriveTests.class.getClassLoader().getResourceAsStream("hamilton.jpg");
     	long fileSize = (long) uploadFile.available();
 
-    	IProgressCallback<DriveItem> callback = new IProgressCallback<DriveItem> () {
-    		@Override
-        	public void progress(final long current, final long max) {
-        		//Check progress
-        	}
-    		@Override
-    		public void success(final DriveItem result) {
-    			//Handle the successful response
-    			String finishedItemId = result.id;
-    			Assert.assertNotNull(finishedItemId);
-    		}
-    		
-    		@Override
-    		public void failure(final ClientException ex) {
-    			//Handle the failed upload
-    			Assert.fail("Upload session failed");
-    		}
-    	};
-    	
     	UploadSession uploadSession = testBase
     			.graphClient
     			.me()
@@ -85,4 +89,43 @@ public void testDownloadWithCustomRequest() throws IOException {
 		   assertFalse("stream should not be empty", stream.read() == -1);
 		}
 	}
+	@Test
+	public void downloadJsonFileFromOneDrive() throws Exception {
+		final DriveItemUploadableProperties item = new DriveItemUploadableProperties();
+		item.name = "test.json";
+		item.additionalDataManager().put("@microsoft.graph.conflictBehavior", new JsonPrimitive("replace"));
+
+		final InputStream uploadFile = new ByteArrayInputStream("{\"hehe\":\"haha\"}".getBytes(StandardCharsets.UTF_8));
+
+    	final long fileSize = (long) uploadFile.available();
+
+		final UploadSession session = testBase.graphClient.me()
+			.drive()
+			.root()
+			.itemWithPath(item.name)
+			.createUploadSession(item)
+			.buildRequest()
+			.post();
+
+		ChunkedUploadProvider<DriveItem> chunkedUploadProvider = new ChunkedUploadProvider<DriveItem>(
+    			session, 
+    			testBase.graphClient, 
+    			uploadFile, 
+    			fileSize, 
+    			DriveItem.class);
+		
+		chunkedUploadProvider.upload(callback);
+		
+		final InputStream stream = testBase.graphClient.me()
+			.drive()
+			.root()
+			.itemWithPath(item.name)
+			.content()
+			.buildRequest()
+			.get();
+
+		final String fileContent = CoreHttpProvider.streamToString(stream);
+
+		assertTrue(fileContent.length() > 0);
+	}
 }