fix(misc): Use new client provider and remove usage of deprecated OkH…

…ttpClientConfiguration (#682) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · May 13, 2020 · 8fa8bdb · 8fa8bdb
1 parent 3ea1a68
commit 8fa8bdb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/fiat-api/fiat-api.gradle b/fiat-api/fiat-api.gradle
@@ -28,6 +28,7 @@ dependencies {
   implementation "com.netflix.spinnaker.kork:kork-web"
   implementation "com.squareup.retrofit:retrofit"
   implementation "com.squareup.retrofit:converter-jackson"
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation "org.apache.commons:commons-lang3"
 
   compileOnly "javax.servlet:javax.servlet-api"

diff --git a/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatAuthenticationConfig.java b/fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatAuthenticationConfig.java
@@ -18,14 +18,14 @@
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.netflix.spinnaker.config.OkHttpClientConfiguration;
+import com.jakewharton.retrofit.Ok3Client;
+import com.netflix.spinnaker.config.DefaultServiceEndpoint;
+import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider;
 import com.netflix.spinnaker.okhttp.SpinnakerRequestInterceptor;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
-import com.squareup.okhttp.OkHttpClient;
-import java.util.concurrent.TimeUnit;
 import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import okhttp3.OkHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -39,10 +39,8 @@
 import org.springframework.security.web.authentication.AnonymousAuthenticationFilter;
 import retrofit.Endpoints;
 import retrofit.RestAdapter;
-import retrofit.client.OkClient;
 import retrofit.converter.JacksonConverter;
 
-@Slf4j
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
 @Configuration
@@ -59,28 +57,20 @@ public class FiatAuthenticationConfig {
   public FiatService fiatService(
       FiatClientConfigurationProperties fiatConfigurationProperties,
       SpinnakerRequestInterceptor interceptor,
-      OkHttpClientConfiguration okHttpClientConfiguration) {
+      OkHttpClientProvider okHttpClientProvider) {
     // New role providers break deserialization if this is not enabled.
     val objectMapper = new ObjectMapper();
     objectMapper.enable(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL);
     objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
 
-    OkHttpClient okHttpClient = okHttpClientConfiguration.create();
-
-    if (fiatConfigurationProperties.getConnectTimeoutMs() != null) {
-      okHttpClient.setConnectTimeout(
-          fiatConfigurationProperties.getConnectTimeoutMs(), TimeUnit.MILLISECONDS);
-    }
-
-    if (fiatConfigurationProperties.getReadTimeoutMs() != null) {
-      okHttpClient.setConnectTimeout(
-          fiatConfigurationProperties.getReadTimeoutMs(), TimeUnit.MILLISECONDS);
-    }
+    OkHttpClient okHttpClient =
+        okHttpClientProvider.getClient(
+            new DefaultServiceEndpoint("fiat", fiatConfigurationProperties.getBaseUrl()));
 
     return new RestAdapter.Builder()
         .setEndpoint(Endpoints.newFixedEndpoint(fiatConfigurationProperties.getBaseUrl()))
         .setRequestInterceptor(interceptor)
-        .setClient(new OkClient(okHttpClient))
+        .setClient(new Ok3Client(okHttpClient))
         .setConverter(new JacksonConverter(objectMapper))
         .setLogLevel(retrofitLogLevel)
         .setLog(new Slf4jRetrofitLogger(FiatService.class))