refactor(retrofit): remove all com.squareup.okhttp dependencies (#1064)

spinnaker · Nov 14, 2024 · 200eb96 · 200eb96
1 parent 38202d7
commit 200eb96
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/build.gradle b/build.gradle
@@ -96,9 +96,6 @@ subprojects { project ->
 
       api "com.squareup.retrofit:retrofit"
       api "com.squareup.retrofit:converter-jackson"
-      api "com.squareup.okhttp:okhttp"
-      api "com.squareup.okhttp:okhttp-urlconnection"
-      api "com.squareup.okhttp:okhttp-apache"
 
       testImplementation "org.springframework.boot:spring-boot-starter-test"
       testImplementation "org.spockframework:spock-core"

diff --git a/kayenta-atlas/kayenta-atlas.gradle b/kayenta-atlas/kayenta-atlas.gradle
@@ -3,10 +3,6 @@ dependencies {
 
   api "com.squareup.retrofit:retrofit"
   api "com.squareup.retrofit:converter-jackson"
-  api "com.squareup.okhttp:okhttp"
-  api "com.squareup.okhttp:okhttp-urlconnection"
-  api "com.squareup.okhttp:okhttp-apache"
-
   api "org.apache.commons:commons-io:1.3.2"
 
   implementation "io.spinnaker.kork:kork-retrofit"

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientFactory.java
@@ -23,11 +23,11 @@
 import com.netflix.spinnaker.kork.annotations.VisibleForTesting;
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerRetrofitErrorHandler;
 import com.netflix.spinnaker.retrofit.Slf4jRetrofitLogger;
-import com.squareup.okhttp.Credentials;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.function.Function;
+import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tomcat.util.codec.binary.Base64;

diff --git a/...figbin/src/main/java/com/netflix/kayenta/configbin/config/ConfigBinResponseConverter.java b/...figbin/src/main/java/com/netflix/kayenta/configbin/config/ConfigBinResponseConverter.java
@@ -16,14 +16,14 @@
 
 package com.netflix.kayenta.configbin.config;
 
-import com.squareup.okhttp.RequestBody;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.RequestBody;
 import okio.Buffer;
 import org.springframework.stereotype.Component;
 import retrofit.converter.ConversionException;

diff --git a/...configbin/src/main/java/com/netflix/kayenta/configbin/service/ConfigBinRemoteService.java b/...configbin/src/main/java/com/netflix/kayenta/configbin/service/ConfigBinRemoteService.java
@@ -16,7 +16,7 @@
 
 package com.netflix.kayenta.configbin.service;
 
-import com.squareup.okhttp.RequestBody;
+import okhttp3.RequestBody;
 import retrofit.client.Response;
 import retrofit.http.*;
 

diff --git a/...onfigbin/src/main/java/com/netflix/kayenta/configbin/storage/ConfigBinStorageService.java b/...onfigbin/src/main/java/com/netflix/kayenta/configbin/storage/ConfigBinStorageService.java
@@ -33,8 +33,6 @@
 import com.netflix.spinnaker.kork.retrofit.exceptions.SpinnakerServerException;
 import com.netflix.spinnaker.kork.web.exceptions.NotFoundException;
 import com.netflix.spinnaker.security.AuthenticatedRequest;
-import com.squareup.okhttp.MediaType;
-import com.squareup.okhttp.RequestBody;
 import java.io.IOException;
 import java.time.Instant;
 import java.util.*;
@@ -44,6 +42,8 @@
 import lombok.Getter;
 import lombok.Singular;
 import lombok.extern.slf4j.Slf4j;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;