Skip to content

Commit 1fe44f5

Browse files
authored
Merge pull request #1366 from ban-xiu/fix-issue-1204-4.3.x
Fix issue #1204
2 parents 35475d6 + f14a7d0 commit 1fe44f5

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/encoding/FeignAcceptGzipEncodingAutoConfiguration.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@
1616

1717
package org.springframework.cloud.openfeign.encoding;
1818

19-
import feign.Client;
2019
import feign.Feign;
2120

2221
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
23-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2422
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2523
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2624
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -39,7 +37,6 @@
3937
@Configuration(proxyBeanMethods = false)
4038
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
4139
@ConditionalOnClass(Feign.class)
42-
@ConditionalOnBean(Client.class)
4340
@ConditionalOnProperty("spring.cloud.openfeign.compression.response.enabled")
4441
// The OK HTTP client uses "transparent" compression.
4542
// If the accept-encoding header is present, it disables transparent compression.

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignCompressionTests.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@ void shouldNotAddInterceptorsIfFeignOkHttpClientPresent() {
7474
});
7575
}
7676

77+
@Test
78+
void shouldAddResponseCompressionInterceptorWithoutClientBean() {
79+
new ApplicationContextRunner()
80+
.withPropertyValues("spring.cloud.openfeign.compression.response.enabled=true",
81+
"spring.cloud.openfeign.okhttp.enabled=false")
82+
.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class,
83+
FeignAcceptGzipEncodingAutoConfiguration.class))
84+
.run(context -> {
85+
assertThat(context).hasSingleBean(FeignAcceptGzipEncodingInterceptor.class);
86+
});
87+
}
88+
7789
@Configuration
7890
static class OkHttpClientConfiguration {
7991

0 commit comments

Comments
 (0)