refactor(retrofit): replace OkClient with Ok3Client

spinnaker · Nov 20, 2024 · 7c960e8 · 7c960e8
1 parent b5c6d09
commit 7c960e8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/halyard-cli/halyard-cli.gradle b/halyard-cli/halyard-cli.gradle
@@ -10,6 +10,7 @@ dependencies {
   implementation 'ch.qos.logback:logback-classic'
   implementation 'com.squareup.retrofit:retrofit'
   implementation 'com.squareup.retrofit:converter-jackson'
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation 'com.fasterxml.jackson.core:jackson-annotations'
   implementation 'com.fasterxml.jackson.core:jackson-core'
   implementation 'com.fasterxml.jackson.core:jackson-databind'

diff --git a/halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/services/v1/Daemon.java b/halyard-cli/src/main/java/com/netflix/spinnaker/halyard/cli/services/v1/Daemon.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jakewharton.retrofit.Ok3Client;
 import com.netflix.spinnaker.halyard.cli.command.v1.GlobalOptions;
 import com.netflix.spinnaker.halyard.config.model.v1.artifacts.ArtifactTemplate;
 import com.netflix.spinnaker.halyard.config.model.v1.canary.AbstractCanaryAccount;
@@ -45,7 +46,6 @@
 import java.util.function.Supplier;
 import lombok.extern.slf4j.Slf4j;
 import retrofit.RestAdapter;
-import retrofit.client.OkClient;
 import retrofit.converter.JacksonConverter;
 
 @Slf4j
@@ -1452,7 +1452,7 @@ public static Supplier<Void> setStats(String deploymentName, boolean validate, S
   private static DaemonService createService(boolean log) {
     return new RestAdapter.Builder()
         .setEndpoint(GlobalOptions.getGlobalOptions().getDaemonEndpoint())
-        .setClient(new OkClient())
+        .setClient(new Ok3Client())
         .setConverter(new JacksonConverter(getObjectMapper()))
         .setLogLevel(log ? RestAdapter.LogLevel.FULL : RestAdapter.LogLevel.NONE)
         .build()

diff --git a/halyard-deploy/halyard-deploy.gradle b/halyard-deploy/halyard-deploy.gradle
@@ -18,9 +18,8 @@ dependencies {
   implementation 'org.apache.commons:commons-lang3'
   implementation 'commons-io:commons-io'
   implementation 'com.squareup.retrofit:retrofit'
-  implementation 'com.squareup.okhttp3:okhttp'
 
-  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0"
+  implementation "com.jakewharton.retrofit:retrofit1-okhttp3-client"
   implementation 'io.fabric8:kubernetes-client'
   implementation 'redis.clients:jedis'
   implementation 'org.apache.groovy:groovy'