Update for OkHttp3

Author: rogerhu

Parse/build.gradle

@@ -42,13 +42,13 @@ android {
 dependencies {
     compile 'com.parse.bolts:bolts-tasks:1.4.0'
 
-    provided 'com.squareup.okhttp3:okhttp:3.2.0'
+    provided 'com.squareup.okhttp3:okhttp:3.3.0'
     provided 'com.facebook.stetho:stetho:1.3.0'
 
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'org.skyscreamer:jsonassert:1.2.3'
     testCompile 'org.mockito:mockito-core:1.10.19'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.2.0'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.3.0'
 }
 
 android.libraryVariants.all { variant ->

Parse/src/main/java/com/parse/http/ParseHttpRequest.java

@@ -10,6 +10,7 @@
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -107,8 +108,8 @@ public Builder() {
     public Builder(ParseHttpRequest request) {
       this.url = request.url;
       this.method = request.method;
-      this.headers = new HashMap<>(request.headers);
       this.body = request.body;
+      setHeaders(request.headers);
     }
 
     /**
@@ -157,7 +158,7 @@ public Builder setBody(ParseHttpBody body) {
      * @return This {@code Builder}.
      */
     public Builder addHeader(String name, String value) {
-      headers.put(name, value);
+      headers.put(name.toLowerCase(Locale.US), value);
       return this;
     }
 
@@ -181,7 +182,12 @@ public Builder addHeaders(Map<String, String> headers) {
      * @return This {@code Builder}.
      */
     public Builder setHeaders(Map<String, String> headers) {
-      this.headers = new HashMap<>(headers);
+      this.headers = new HashMap<>();
+
+      for (Map.Entry<String, String> entry: headers.entrySet()) {
+        addHeader(entry.getKey(), entry.getValue());
+      }
+
       return this;
     }
 
@@ -203,7 +209,8 @@ public ParseHttpRequest build() {
   private ParseHttpRequest(Builder builder) {
     this.url = builder.url;
     this.method = builder.method;
-    this.headers = Collections.unmodifiableMap(new HashMap<>(builder.headers));
+    builder.setHeaders(builder.headers);
+    this.headers = Collections.unmodifiableMap(builder.headers);
     this.body = builder.body;
   }
 

Parse/src/test/java/com/parse/ParseOkHttpClientTest.java

@@ -11,15 +11,6 @@
 import com.parse.http.ParseHttpRequest;
 import com.parse.http.ParseHttpResponse;
 import com.parse.http.ParseNetworkInterceptor;
-import okhttp3.MediaType;
-import okhttp3.Protocol;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.mockwebserver.MockResponse;
-import okhttp3.mockwebserver.MockWebServer;
-import okhttp3.mockwebserver.RecordedRequest;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -37,6 +28,15 @@
 import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPOutputStream;
 
+import okhttp3.MediaType;
+import okhttp3.Protocol;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
 import okio.Buffer;
 import okio.BufferedSource;
 
@@ -372,7 +372,7 @@ private ParseHttpRequest generateClientRequest() throws Exception {
   private void verifyClientRequest(ParseHttpRequest parseRequest) throws IOException {
     assertEquals(server.url("/").toString(), parseRequest.getUrl());
     assertEquals(ParseHttpRequest.Method.POST, parseRequest.getMethod());
-    assertEquals("requestValue", parseRequest.getHeader("requestKey"));
+    assertEquals("requestValue", parseRequest.getHeader("requestkey"));
     assertEquals("application/json", parseRequest.getBody().getContentType());
     JSONObject json = new JSONObject();
     try {

Parse/src/test/java/com/parse/ParseRESTUserCommandTest.java

@@ -25,7 +25,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.skyscreamer.jsonassert.JSONAssert.assertEquals;
 
 public class ParseRESTUserCommandTest {
@@ -139,7 +138,7 @@ public void testAddAdditionalHeaders() throws Exception {
     ParseHttpRequest.Builder requestBuilder  = new ParseHttpRequest.Builder();
     command.addAdditionalHeaders(requestBuilder);
 
-    assertEquals("1", requestBuilder.build().getHeader("X-Parse-Revocable-Session"));
+    assertEquals("1", requestBuilder.build().getHeader("x-parse-revocable-session"));
   }
 
   //endregion