From 9ac36c7f3f2fe4358429f682f06ae338ff7a5380 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Wed, 2 May 2018 15:52:36 -0400 Subject: [PATCH] Use type parameter instead of class. Fixes problem when OK HTTP is not on the classpath. --- .../encoding/FeignAcceptGzipEncodingAutoConfiguration.java | 3 +-- .../encoding/FeignContentGzipEncodingAutoConfiguration.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java index defd1162..da7731e9 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.cloud.openfeign.encoding; import feign.Client; import feign.Feign; -import okhttp3.OkHttpClient; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -43,7 +42,7 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnProperty(value = "feign.compression.response.enabled", matchIfMissing = false) //The OK HTTP client uses "transparent" compression. //If the accept-encoding header is present it disable transparent compression -@ConditionalOnMissingBean(OkHttpClient.class) +@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient") @AutoConfigureAfter(FeignAutoConfiguration.class) public class FeignAcceptGzipEncodingAutoConfiguration { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java index 04229c1b..746377ca 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignContentGzipEncodingAutoConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.cloud.openfeign.encoding; import feign.Client; import feign.Feign; -import okhttp3.OkHttpClient; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -42,7 +41,7 @@ import org.springframework.context.annotation.Configuration; @ConditionalOnBean(Client.class) //The OK HTTP client uses "transparent" compression. //If the content-encoding header is present it disable transparent compression -@ConditionalOnMissingBean(OkHttpClient.class) +@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient") @ConditionalOnProperty(value = "feign.compression.request.enabled", matchIfMissing = false) @AutoConfigureAfter(FeignAutoConfiguration.class) public class FeignContentGzipEncodingAutoConfiguration {