From b2e395db7a9660265117252e60e266f8f71b1cc3 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 27 May 2019 15:19:22 +0200 Subject: [PATCH] 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 --- .../boot/autoconfigure/http/codec/CodecsAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java index a3cd3ebbd3..0735abf7c2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/http/codec/CodecsAutoConfiguration.java @@ -33,6 +33,7 @@ import org.springframework.http.codec.CodecConfigurer; import org.springframework.http.codec.json.Jackson2JsonDecoder; import org.springframework.http.codec.json.Jackson2JsonEncoder; import org.springframework.util.MimeType; +import org.springframework.web.reactive.function.client.WebClient; /** * {@link EnableAutoConfiguration Auto-configuration} for @@ -43,7 +44,7 @@ import org.springframework.util.MimeType; * @since 2.0.0 */ @Configuration(proxyBeanMethods = false) -@ConditionalOnClass(CodecConfigurer.class) +@ConditionalOnClass({ CodecConfigurer.class, WebClient.class }) @AutoConfigureAfter(JacksonAutoConfiguration.class) public class CodecsAutoConfiguration {