Skip to content

Commit b2e395d

Browse files
committed
Avoid codec auto-configuration when WebFlux is not present
This commit prevents the `CodecsAutoConfiguration` from being processed if spring-webflux is not on classpath, since it is only useful for the WebFlux server infrastructure or `WebClient`. Closes gh-15690
1 parent 15bdc12 commit b2e395d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.springframework.http.codec.json.Jackson2JsonDecoder;
3434
import org.springframework.http.codec.json.Jackson2JsonEncoder;
3535
import org.springframework.util.MimeType;
36+
import org.springframework.web.reactive.function.client.WebClient;
3637

3738
/**
3839
* {@link EnableAutoConfiguration Auto-configuration} for
@@ -43,7 +44,7 @@
4344
* @since 2.0.0
4445
*/
4546
@Configuration(proxyBeanMethods = false)
46-
@ConditionalOnClass(CodecConfigurer.class)
47+
@ConditionalOnClass({ CodecConfigurer.class, WebClient.class })
4748
@AutoConfigureAfter(JacksonAutoConfiguration.class)
4849
public class CodecsAutoConfiguration {
4950

0 commit comments

Comments
 (0)