Merge pull request #606 from cloudant/update-cloudant-http-2.19.0

Updated cloudant-http to version 2.19.0

Author: ricellis

AndroidTest/app/build.gradle

@@ -85,7 +85,7 @@ dependencies {
     compile 'commons-io:commons-io:2.4'
     compile 'commons-codec:commons-codec:1.9'
     compile 'org.apache.commons:commons-lang3:3.3.2'
-    compile group: 'com.cloudant', name: 'cloudant-http', version:'2.12.0'
+    compile group: 'com.cloudant', name: 'cloudant-http', version:'2.19.0'
     compile 'com.google.code.findbugs:jsr305:3.0.0' //this is needed for some versions of android
     compile files('../../cloudant-sync-datastore-android-encryption/libs/sqlcipher.jar') //required sqlcipher lib
     compile files('../../cloudant-sync-datastore-android/libs/android-support-v4.jar')

CHANGES.md

@@ -1,6 +1,8 @@
 # 2.x.y (Unreleased)
 - [IMPROVED] Record checkpoint on empty `_changes` result in pull replications. This change optimizes 
    filtered replications when changes in remote database doesn't match the replication filter. 
+- [UPGRADED] Upgraded to version 2.19.0 of the `cloudant-http` library.
+
 # 2.4.0 (2019-01-15)
 - [NEW] `Database` methods `read`, `contains`, `create`, and `delete` now accept local
   (non-replicating documents). These documents must have their document ID prefixed with `_local/`

cloudant-sync-datastore-core/build.gradle

@@ -3,7 +3,7 @@
 // ************ //
 dependencies {
 
-    compile group: 'com.cloudant', name: 'cloudant-http', version:'2.12.0'
+    compile group: 'com.cloudant', name: 'cloudant-http', version:'2.19.0'
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.1.1'
     compile group: 'commons-codec', name: 'commons-codec', version:'1.10'
     compile group: 'commons-io', name: 'commons-io', version:'2.4'

cloudant-sync-datastore-core/src/test/java/com/cloudant/sync/internal/replication/ReplicationTestBase.java

@@ -17,6 +17,7 @@
 package com.cloudant.sync.internal.replication;
 
 import com.cloudant.common.CouchTestBase;
+import com.cloudant.http.HttpConnectionInterceptorContext;
 import com.cloudant.http.HttpConnectionRequestInterceptor;
 import com.cloudant.http.HttpConnectionResponseInterceptor;
 import com.cloudant.http.internal.interceptors.CookieInterceptor;
@@ -40,9 +41,12 @@
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -266,25 +270,27 @@ protected PullResult pull(PullFilter filter) throws Exception {
     }
 
     protected void assertCookieInterceptorPresent(ReplicatorBuilder p, String expectedRequestBody)
-            throws NoSuchFieldException, IllegalAccessException {
+            throws NoSuchFieldException, NoSuchMethodException, IllegalAccessException,
+            InvocationTargetException {
         // peek inside these private fields to see that interceptors have been set
         Field reqI = ReplicatorBuilder.class.getDeclaredField("requestInterceptors");
         Field respI = ReplicatorBuilder.class.getDeclaredField("responseInterceptors");
         reqI.setAccessible(true);
         respI.setAccessible(true);
-        List<HttpConnectionRequestInterceptor> reqIList = (List)reqI.get(p);
-        List<HttpConnectionRequestInterceptor> respIList = (List)respI.get(p);
+        List<HttpConnectionRequestInterceptor> reqIList = (List) reqI.get(p);
+        List<HttpConnectionRequestInterceptor> respIList = (List) respI.get(p);
         // Note this introspection happens before the interceptors are passed to the CouchClient so
         // excludes any other interceptors (e.g. UserAgentInterceptor that might be added there).
         Assert.assertEquals(1, reqIList.size());
         Assert.assertEquals(CookieInterceptor.class, reqIList.get(0).getClass());
         Assert.assertEquals(1, respIList.size());
         Assert.assertEquals(CookieInterceptor.class, respIList.get(0).getClass());
-        CookieInterceptorBase ci = (CookieInterceptorBase)reqIList.get(0);
-        Field srbField = CookieInterceptorBase.class.getDeclaredField("sessionRequestBody");
-        srbField.setAccessible(true);
-        byte[] srb = (byte[])srbField.get(ci);
-        String srbString = new String(srb);
+        CookieInterceptor ci = (CookieInterceptor) reqIList.get(0);
+        Method getPayloadMethod = CookieInterceptorBase.class.getDeclaredMethod(
+                "getSessionRequestPayload", new Class[]{HttpConnectionInterceptorContext.class});
+        getPayloadMethod.setAccessible(true);
+        byte[] srb = (byte[]) getPayloadMethod.invoke(ci, new Object[]{null});
+        String srbString = new String(srb, Charset.forName("UTF-8"));
         Assert.assertEquals(expectedRequestBody, srbString);
     }