From 9e24d5936cd721fa448057476aa1e272b73cb067 Mon Sep 17 00:00:00 2001
From: Sairam Rekapalli <srekapalli@netflix.com>
Date: Thu, 21 May 2020 22:33:08 -0700
Subject: [PATCH] fix(misc): Moving to the new client provider implementation
 instead. (#4618)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
---
 clouddriver-core/clouddriver-core.gradle       |  1 +
 .../clouddriver/config/RetrofitConfig.groovy   | 18 +++++-------------
 .../src/test/resources/application.properties  |  1 +
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/clouddriver-core/clouddriver-core.gradle b/clouddriver-core/clouddriver-core.gradle
index 603da674173..163f1bb774a 100644
--- a/clouddriver-core/clouddriver-core.gradle
+++ b/clouddriver-core/clouddriver-core.gradle
@@ -33,6 +33,7 @@ dependencies {
   implementation "com.squareup.okhttp:okhttp-urlconnection"
   implementation "com.squareup.retrofit:converter-jackson"
   implementation "com.squareup.retrofit:retrofit"
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "io.reactivex:rxjava"
   implementation "net.jodah:failsafe:1.0.4"
   implementation "org.apache.commons:commons-exec"
diff --git a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/config/RetrofitConfig.groovy b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/config/RetrofitConfig.groovy
index e10701597e1..de035757ddd 100644
--- a/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/config/RetrofitConfig.groovy
+++ b/clouddriver-core/src/main/groovy/com/netflix/spinnaker/clouddriver/config/RetrofitConfig.groovy
@@ -16,20 +16,19 @@
 
 package com.netflix.spinnaker.clouddriver.config
 
+import com.jakewharton.retrofit.Ok3Client
 import com.netflix.spinnaker.clouddriver.core.Front50ConfigurationProperties
 import com.netflix.spinnaker.clouddriver.core.services.Front50Service
 import com.netflix.spinnaker.clouddriver.exceptions.SpinnakerRetrofitErrorHandler
-import com.netflix.spinnaker.config.OkHttpClientConfiguration
+import com.netflix.spinnaker.config.DefaultServiceEndpoint
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger
-import org.springframework.beans.factory.config.ConfigurableBeanFactory
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
 import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.Scope
 import retrofit.RequestInterceptor
 import retrofit.RestAdapter
-import retrofit.client.OkClient
 import retrofit.converter.JacksonConverter
 
 import static retrofit.Endpoints.newFixedEndpoint
@@ -38,21 +37,14 @@ import static retrofit.Endpoints.newFixedEndpoint
 @EnableConfigurationProperties(Front50ConfigurationProperties)
 class RetrofitConfig {
 
-  @Bean
-  @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
-  OkClient okClient(OkHttpClientConfiguration okHttpClientConfiguration) {
-    def client = okHttpClientConfiguration.create()
-    return new OkClient(client)
-  }
-
   @Bean
   @ConditionalOnProperty(name = 'services.front50.enabled', matchIfMissing = true)
-  Front50Service front50Service(Front50ConfigurationProperties front50ConfigurationProperties, RestAdapter.LogLevel retrofitLogLevel, OkClient okClient, RequestInterceptor spinnakerRequestInterceptor) {
+  Front50Service front50Service(Front50ConfigurationProperties front50ConfigurationProperties, RestAdapter.LogLevel retrofitLogLevel, OkHttpClientProvider clientProvider, RequestInterceptor spinnakerRequestInterceptor) {
     def endpoint = newFixedEndpoint(front50ConfigurationProperties.baseUrl)
     new RestAdapter.Builder()
       .setRequestInterceptor(spinnakerRequestInterceptor)
       .setEndpoint(endpoint)
-      .setClient(okClient)
+      .setClient(new Ok3Client(clientProvider.getClient(new DefaultServiceEndpoint("front50", endpoint.getUrl()))))
       .setConverter(new JacksonConverter())
       .setLogLevel(retrofitLogLevel)
       .setLog(new Slf4jRetrofitLogger(Front50Service))
diff --git a/clouddriver-web/src/test/resources/application.properties b/clouddriver-web/src/test/resources/application.properties
index 485f6e0537e..f3b97762a34 100644
--- a/clouddriver-web/src/test/resources/application.properties
+++ b/clouddriver-web/src/test/resources/application.properties
@@ -1 +1,2 @@
 services.fiat.baseUrl=https://fiat.net
+services.front50.baseUrl=https://front50.net