Skip to content

Commit 1bc93cb

Browse files
committed
Merge branch '4.3.x'
2 parents 37c3b95 + 1fe44f5 commit 1bc93cb

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

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;
@@ -38,7 +36,6 @@
3836
@Configuration(proxyBeanMethods = false)
3937
@EnableConfigurationProperties(FeignClientEncodingProperties.class)
4038
@ConditionalOnClass(Feign.class)
41-
@ConditionalOnBean(Client.class)
4239
@ConditionalOnProperty("spring.cloud.openfeign.compression.response.enabled")
4340
@AutoConfigureAfter(FeignAutoConfiguration.class)
4441
public class FeignAcceptGzipEncodingAutoConfiguration {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,16 @@ void shouldAddCompressionInterceptors() {
5454
});
5555
}
5656

57+
@Test
58+
void shouldAddResponseCompressionInterceptorWithoutClientBean() {
59+
new ApplicationContextRunner()
60+
.withPropertyValues("spring.cloud.openfeign.compression.response.enabled=true",
61+
"spring.cloud.openfeign.okhttp.enabled=false")
62+
.withConfiguration(AutoConfigurations.of(FeignAutoConfiguration.class,
63+
FeignAcceptGzipEncodingAutoConfiguration.class))
64+
.run(context -> {
65+
assertThat(context).hasSingleBean(FeignAcceptGzipEncodingInterceptor.class);
66+
});
67+
}
68+
5769
}

0 commit comments

Comments
 (0)