From 6154e742c15560fa3a90b4f66b8fdb6284c3228a Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Wed, 15 May 2024 13:52:55 -0400 Subject: [PATCH] chore(dependencies): Autobump orcaVersion (#1036) * chore(dependencies): Autobump orcaVersion * refactor(retrofit): Replace the RetrofitExceptionHandler with SpinnakerServerExceptionHandler As RetrofitExceptionHandler have been dismantled from [orca](https://github.com/spinnaker/orca/pull/4716), now replacing it with SpinnakerServerExceptionHandler. --------- Co-authored-by: root Co-authored-by: j-sandy <30489233+j-sandy@users.noreply.github.com> --- gradle.properties | 2 +- .../retrofit/config/RetrofitClientConfiguration.java | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index fc1b19f36..74f954751 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -orcaVersion=8.51.0 +orcaVersion=8.52.0 org.gradle.parallel=true spinnakerGradleVersion=8.32.1 targetJava11=true diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientConfiguration.java b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientConfiguration.java index 6bfed46a0..3037cc929 100644 --- a/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientConfiguration.java +++ b/kayenta-core/src/main/java/com/netflix/kayenta/retrofit/config/RetrofitClientConfiguration.java @@ -20,7 +20,6 @@ import com.netflix.kayenta.atlas.config.KayentaSerializationConfigurationProperties; import com.netflix.kayenta.config.KayentaConfiguration; import com.netflix.spinnaker.config.OkHttpClientConfiguration; -import com.netflix.spinnaker.orca.retrofit.exceptions.RetrofitExceptionHandler; import com.netflix.spinnaker.orca.retrofit.exceptions.SpinnakerServerExceptionHandler; import com.squareup.okhttp.ConnectionPool; import com.squareup.okhttp.OkHttpClient; @@ -52,12 +51,6 @@ OkHttpClient okHttpClient(OkHttpClientConfiguration okHttpClientConfig) { return okHttpClient; } - @Bean - @Order(Ordered.HIGHEST_PRECEDENCE) - RetrofitExceptionHandler retrofitExceptionHandler() { - return new RetrofitExceptionHandler(); - } - @Bean @Order(Ordered.HIGHEST_PRECEDENCE) SpinnakerServerExceptionHandler spinnakerServerExceptionHandler() {