fix(misc): Remove OkHttp2 usage and use provider impls (#1010)

echo-rest/echo-rest.gradle

@@ -17,9 +17,7 @@
 dependencies {
   implementation "com.squareup.retrofit:retrofit"
   implementation "com.squareup.retrofit:converter-jackson"
-  implementation "com.squareup.okhttp:okhttp"
-  implementation "com.squareup.okhttp:okhttp-urlconnection"
-  implementation "com.squareup.okhttp:okhttp-apache"
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation project(':echo-model')
   implementation project(':echo-api')
   implementation project(':echo-core')

echo-rest/src/main/java/com/netflix/spinnaker/echo/config/RestConfig.java

@@ -18,14 +18,17 @@
 
 import static retrofit.Endpoints.newFixedEndpoint;
 
-import com.netflix.spinnaker.echo.rest.RestClientFactory;
+import com.jakewharton.retrofit.Ok3Client;
+import com.netflix.spinnaker.config.DefaultServiceEndpoint;
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider;
 import com.netflix.spinnaker.echo.rest.RestService;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.util.HashMap;
 import java.util.Map;
+import okhttp3.OkHttpClient;
 import org.apache.commons.codec.binary.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -89,9 +92,9 @@ HeadersFromFile headersFromFile() {
   @Bean
   RestUrls restServices(
       RestProperties restProperties,
-      RestClientFactory clientFactory,
       RestAdapter.LogLevel retrofitLogLevel,
       RequestInterceptorAttacher requestInterceptorAttacher,
+      OkHttpClientProvider okHttpClientProvider,
       HeadersFromFile headersFromFile) {
 
     RestUrls restUrls = new RestUrls();
@@ -100,7 +103,13 @@ RestUrls restServices(
       RestAdapter.Builder restAdapterBuilder =
           new RestAdapter.Builder()
               .setEndpoint(newFixedEndpoint(endpoint.getUrl()))
-              .setClient(clientFactory.getClient(endpoint.insecure))
+              .setClient(
+                  endpoint.insecure
+                      ? new Ok3Client(
+                          okHttpClientProvider.getClient(
+                              new DefaultServiceEndpoint(
+                                  endpoint.getEventName(), endpoint.getUrl(), false)))
+                      : new Ok3Client(new OkHttpClient()))
               .setLogLevel(retrofitLogLevel)
               .setLog(new Slf4jRetrofitLogger(RestService.class))
               .setConverter(new JacksonConverter());

echo-rest/src/test/groovy/com/netflix/spinnaker/echo/config/RestConfigSpec.groovy

@@ -1,6 +1,8 @@
 package com.netflix.spinnaker.echo.config
 
-import com.netflix.spinnaker.echo.rest.RestClientFactory
+import com.netflix.spinnaker.config.okhttp3.InsecureOkHttpClientBuilderProvider
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
+import okhttp3.OkHttpClient
 import retrofit.RequestInterceptor
 import retrofit.RestAdapter
 import spock.lang.Specification
@@ -23,7 +25,7 @@ class RestConfigSpec extends Specification {
 
   void configureRestServices(RestProperties.RestEndpointConfiguration endpoint, RestConfig.HeadersFromFile headersFromFile) {
     RestProperties restProperties =  new RestProperties(endpoints: [endpoint])
-    config.restServices(restProperties, new RestClientFactory(), config.retrofitLogLevel("BASIC"), attacher, headersFromFile)
+    config.restServices(restProperties, config.retrofitLogLevel("BASIC"), attacher, new OkHttpClientProvider([new InsecureOkHttpClientBuilderProvider(new OkHttpClient())]), headersFromFile)
   }
 
   void "Generate basic auth header"() {