- moves helper methods into a dedicated class for reusability

Author: baywet

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

@@ -31,6 +31,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,7 @@
 import okhttp3.Headers;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
+import okhttp3.Protocol;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
@@ -67,6 +69,7 @@
  * HTTP provider based off of OkHttp and msgraph-sdk-java-core library
  */
 public class CoreHttpProvider implements IHttpProvider {
+	private final HttpResponseHeadersHelper responseHeadersHelper = new HttpResponseHeadersHelper();
 
 	/**
 	 * The serializer
@@ -407,17 +410,17 @@ public Request authenticateRequest(Request request) {
 				if (response.code() == HttpResponseCode.HTTP_NOBODY
 						|| response.code() == HttpResponseCode.HTTP_NOT_MODIFIED) {
 					logger.logDebug("Handling response with no body");                  
-					return handleEmptyResponse(CoreHttpProvider.getResponseHeadersAsMapOfStringList(response), resultClass);
+					return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
 				}
 
 				if (response.code() == HttpResponseCode.HTTP_ACCEPTED) {
 					logger.logDebug("Handling accepted response");
-					return handleEmptyResponse(CoreHttpProvider.getResponseHeadersAsMapOfStringList(response), resultClass);
+					return handleEmptyResponse(responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
 				}
 
 				in = new BufferedInputStream(response.body().byteStream());
 
-				final Map<String, String> headers = CoreHttpProvider.getResponseHeadersAsMapStringString(response);
+				final Map<String, String> headers = responseHeadersHelper.getResponseHeadersAsMapStringString(response);
 
 				if(response.body() == null || response.body().contentLength() == 0)
 					return (Result) null;
@@ -426,7 +429,7 @@ public Request authenticateRequest(Request request) {
 				if (contentType != null && resultClass != InputStream.class && 
 							contentType.contains(Constants.JSON_CONTENT_TYPE)) {
 					logger.logDebug("Response json");
-					return handleJsonResponse(in, CoreHttpProvider.getResponseHeadersAsMapOfStringList(response), resultClass);
+					return handleJsonResponse(in, responseHeadersHelper.getResponseHeadersAsMapOfStringList(response), resultClass);
 				} else if (resultClass == InputStream.class) {
 					logger.logDebug("Response binary");
 					isBinaryStreamInput = true;
@@ -456,37 +459,6 @@ public Request authenticateRequest(Request request) {
 		}
 	}
 
-	/**
-	 * Gets the response headers from OkHttp Response
-	 *
-	 * @param response the OkHttp response
-	 * @return           the set of headers names and value
-	 */
-	static Map<String, String> getResponseHeadersAsMapStringString(final Response response) {
-		final Map<String, String> headers = new HashMap<>();
-		int index = 0;
-		Headers responseHeaders = response.headers();
-		while (index < responseHeaders.size()) {
-			final String headerName = responseHeaders.name(index);
-			final String headerValue = responseHeaders.value(index);
-			if (headerName == null && headerValue == null) {
-				break;
-			}
-			headers.put(headerName, headerValue);
-			index++;
-		}
-		return headers;
-	}
-
-	static Map<String, List<String>> getResponseHeadersAsMapOfStringList(Response response) {
-		Map<String, List<String>> headerFields = response.headers().toMultimap();
-		// Add the response code
-		List<String> list = new ArrayList<>();
-		list.add(String.format("%d", response.code()));
-		headerFields.put("responseCode", list);
-		return headerFields;
-	}
-
 	private Request convertIHttpRequestToOkHttpRequest(IHttpRequest request) {
 		if(request != null) {
 			Request.Builder requestBuilder = new Request.Builder();

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

@@ -0,0 +1,48 @@
+package com.microsoft.graph.http;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import okhttp3.Headers;
+import okhttp3.Response;
+
+public class HttpResponseHeadersHelper {
+    /**
+	 * Gets the response headers from OkHttp Response
+	 *
+	 * @param response the OkHttp response
+	 * @return           the set of headers names and value
+	 */
+	public Map<String, String> getResponseHeadersAsMapStringString(final Response response) {
+		final Map<String, String> headers = new HashMap<>();
+		int index = 0;
+		Headers responseHeaders = response.headers();
+		while (index < responseHeaders.size()) {
+			final String headerName = responseHeaders.name(index);
+			final String headerValue = responseHeaders.value(index);
+			if (headerName == null && headerValue == null) {
+				break;
+			}
+			headers.put(headerName, headerValue);
+			index++;
+		}
+		return headers;
+    }
+    
+    /**
+	 * Gets the response headers from OkHttp Response
+	 *
+	 * @param response the OkHttp response
+	 * @return           the set of headers names and value
+	 */
+	public Map<String, List<String>> getResponseHeadersAsMapOfStringList(Response response) {
+		Map<String, List<String>> headerFields = response.headers().toMultimap();
+		// Add the response code
+		List<String> list = new ArrayList<>();
+		list.add(String.format("%d", response.code()));
+		headerFields.put("responseCode", list);
+		return headerFields;
+	}
+}