Upgrade optional OkHttp dependency to version 3.12.2.

- Fixed FindBugs error by removing conditional block that checks if route.proxy is null

Author: emlaver

CHANGES.md

@@ -1,3 +1,6 @@
+# Unreleased
+- [UPGRADED] Optional OkHttp dependency to version 3.12.2.
+
 # 2.17.0 (2019-05-23)
 - [NEW] Added `com.cloudant.client.api.model.DbInfo#getDocDelCountLong()` to return
   deleted document count as a `long` instead of a `String`.

README.md

@@ -30,7 +30,7 @@ Gradle with [optional `okhttp-urlconnection` dependency](#optional-okhttp-depend
 ```groovy
 dependencies {
     compile group: 'com.cloudant', name: 'cloudant-client', version: '2.17.0'
-    compile group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.8.1'
+    compile group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.12.2'
 }
 ```
 
@@ -55,7 +55,7 @@ Maven with [optional `okhttp-urlconnection` dependency](#optional-okhttp-depende
 <dependency>
   <groupId>com.squareup.okhttp3</groupId>
   <artifactId>okhttp-urlconnection</artifactId>
-  <version>3.8.1</version>
+  <version>3.12.2</version>
 </dependency>
 ~~~
 

cloudant-client/build.gradle

@@ -28,7 +28,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.1.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
     testCompile group: 'org.hamcrest', name: 'hamcrest-library', version: '1.3'
-    testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.8.1'
+    testCompile group: 'com.squareup.okhttp3', name: 'mockwebserver', version: '3.12.2'
     testCompile group: 'org.jmockit', name: 'jmockit', version: '1.34'
     testCompile group: 'org.littleshoot', name: 'littleproxy', version: '1.1.0'
 }

cloudant-http/build.gradle

@@ -15,7 +15,7 @@
 dependencies {
     compile group: 'commons-io', name: 'commons-io', version: '2.4'
     //needed to compile, but optional for consumers of java-cloudant
-    compile(group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.8.1') {
+    compile(group: 'com.squareup.okhttp3', name: 'okhttp-urlconnection', version: '3.12.2') {
         ext.optional = true
     }
 }

cloudant-http/src/main/java/com/cloudant/http/internal/ok/ProxyAuthenticator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2016 IBM Corp. All rights reserved.
+ * Copyright © 2016, 2019 IBM Corp. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
  * except in compliance with the License. You may obtain a copy of the License at
@@ -33,17 +33,12 @@ class ProxyAuthenticator implements Authenticator {
 
     @Override
     public Request authenticate(Route route, Response response) throws IOException {
-        if (route.proxy() != null) {
-            if (creds.equals(response.request().header("Proxy-Authorization"))) {
-                // If the proxy creds have already been tried then give up
-                return null;
-            } else {
-                return response.request().newBuilder().addHeader(ProxyAuthInterceptor
-                        .PROXY_AUTH_HEADER, creds).build();
-            }
-        } else {
-            // Don't interfere with normal Auth, this is just for proxies
+        if (creds.equals(response.request().header("Proxy-Authorization"))) {
+            // If the proxy creds have already been tried then give up
             return null;
+        } else {
+            return response.request().newBuilder().addHeader(ProxyAuthInterceptor
+                    .PROXY_AUTH_HEADER, creds).build();
         }
     }
 }