Merge pull request #566 from ashwanikumar04/dev

Issue#565: fixed the iterator issue

Author: baywet

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

@@ -555,13 +555,12 @@ private <Result> Result handleEmptyResponse(Map<String, List<String>> responseHe
 	public static String streamToString(final InputStream input) {
 		final String httpStreamEncoding = "UTF-8";
 		final String endOfFile = "\\A";
-		final Scanner scanner = new Scanner(input, httpStreamEncoding);
 		String scannerString = "";
-		try {
+		try (final Scanner scanner = new Scanner(input, httpStreamEncoding)) {
 			scanner.useDelimiter(endOfFile);
-			scannerString = scanner.next();
-		} finally {
-			scanner.close();
+			if (scanner.hasNext()) {
+				scannerString = scanner.next();
+			}
 		}
 		return scannerString;
 	}

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

@@ -470,13 +470,12 @@ void setConnectionFactory(final IConnectionFactory factory) {
     public static String streamToString(final InputStream input) {
         final String httpStreamEncoding = "UTF-8";
         final String endOfFile = "\\A";
-        final Scanner scanner = new Scanner(input, httpStreamEncoding);
         String scannerString = "";
-        try {
-        	scanner.useDelimiter(endOfFile);
-            scannerString = scanner.next();
-        } finally {
-        	scanner.close();
+        try (final Scanner scanner = new Scanner(input, httpStreamEncoding)) {
+            scanner.useDelimiter(endOfFile);
+            if (scanner.hasNext()) {
+                scannerString = scanner.next();
+            }
         }
         return scannerString;
     }

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

@@ -366,7 +366,7 @@ public static <T> GraphServiceException createFromConnection(final IHttpRequest
         final String responseMessage = connection.getResponseMessage();
         String rawOutput = "{}";
         if(connection.getInputStream() != null) {
-        	rawOutput = DefaultHttpProvider.streamToString(connection.getInputStream());
+        	rawOutput = CoreHttpProvider.streamToString(connection.getInputStream());
         }
         GraphErrorResponse error;
         try {

src/test/java/com/microsoft/graph/http/CoreHttpProviderTests.java

@@ -5,10 +5,17 @@
 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 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;
 
@@ -28,6 +35,7 @@ public class CoreHttpProviderTests {
 
 	private MockAuthenticationProvider mAuthenticationProvider;
     private CoreHttpProvider mProvider;
+    private Gson GSON = new GsonBuilder().create();
 
     @Test
     public void testErrorResponse() throws Exception {
@@ -96,7 +104,27 @@ public void testHasHeaderReturnsFalse() {
         HeaderOption h = new HeaderOption("name", "value");
         assertFalse(DefaultHttpProvider.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

src/test/java/com/microsoft/graph/http/DefaultHttpProviderTests.java

@@ -28,13 +28,19 @@
 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 java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+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 com.google.gson.JsonObject;
@@ -58,6 +64,7 @@ public class DefaultHttpProviderTests {
 
     private MockAuthenticationProvider mAuthenticationProvider;
     private DefaultHttpProvider mProvider;
+    private Gson GSON = new GsonBuilder().create();
 
     @Test
     public void testNoContentType() throws Exception {
@@ -369,6 +376,26 @@ public void testHasHeaderReturnsFalse() {
         HeaderOption h = new HeaderOption("name", "value");
         assertFalse(DefaultHttpProvider.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 = DefaultHttpProvider.streamToString(inputStream);
+        assertEquals(data, convertedData);
+    }
+
+    @Test
+    public void testStreamToStringReturnsEmpty() {
+        final InputStream inputStream = new ByteArrayInputStream(new byte[0]);
+
+        String convertedData = DefaultHttpProvider.streamToString(inputStream);
+        assertEquals("", convertedData);
+    }
 
 
     /**