From 6ff449bd7804366d1771039aa503ba5100b4f0e4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 12 Jun 2017 12:18:47 +0100 Subject: [PATCH] Align WebFluxAutoConfigurationTests with breaking Framework change CompositeContentTypeResolver was recently removed [1] and WebFluxConfigurationSupport now creates a RequestedContentTypeResolver bean instead. This commit updates WebFluxAutoConfigurationTests accordingly. [1] https://github.com/spring-projects/spring-framework/commit/01a92517bdb657193f2aabc99c20113dada232fa --- .../web/reactive/WebFluxAutoConfigurationTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index be567a301a..c2cd673387 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -45,7 +45,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import org.springframework.web.reactive.HandlerMapping; -import org.springframework.web.reactive.accept.CompositeContentTypeResolver; +import org.springframework.web.reactive.accept.RequestedContentTypeResolver; import org.springframework.web.reactive.config.WebFluxConfigurationSupport; import org.springframework.web.reactive.config.WebFluxConfigurer; import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping; @@ -91,7 +91,7 @@ public class WebFluxAutoConfigurationTests { .isEqualTo(1); assertThat(this.context.getBeansOfType(RequestMappingHandlerAdapter.class).size()) .isEqualTo(1); - assertThat(this.context.getBeansOfType(CompositeContentTypeResolver.class).size()) + assertThat(this.context.getBeansOfType(RequestedContentTypeResolver.class).size()) .isEqualTo(1); assertThat(this.context.getBean("resourceHandlerMapping", HandlerMapping.class)) .isNotNull();