mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 03:43:21 +08:00
Update WebFlux auto-configuration following recent API changes
This commit is contained in:
parent
99aa155412
commit
f52b0b975a
@ -62,6 +62,7 @@ import org.springframework.web.reactive.resource.GzipResourceResolver;
|
||||
import org.springframework.web.reactive.resource.ResourceResolver;
|
||||
import org.springframework.web.reactive.resource.VersionResourceResolver;
|
||||
import org.springframework.web.reactive.result.method.HandlerMethodArgumentResolver;
|
||||
import org.springframework.web.reactive.result.method.annotation.ArgumentResolverConfigurer;
|
||||
import org.springframework.web.reactive.result.view.ViewResolver;
|
||||
|
||||
/**
|
||||
@ -70,6 +71,7 @@ import org.springframework.web.reactive.result.view.ViewResolver;
|
||||
* @author Brian Clozel
|
||||
* @author Rob Winch
|
||||
* @author Stephane Nicoll
|
||||
* @author Andy Wilkinson
|
||||
* @since 2.0.0
|
||||
*/
|
||||
@Configuration
|
||||
@ -114,9 +116,9 @@ public class WebFluxAnnotationAutoConfiguration {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
|
||||
public void configureArgumentResolvers(ArgumentResolverConfigurer configurer) {
|
||||
if (this.argumentResolvers != null) {
|
||||
resolvers.addAll(this.argumentResolvers);
|
||||
this.argumentResolvers.stream().forEach(configurer::addCustomResolver);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -16,6 +16,7 @@
|
||||
|
||||
package org.springframework.boot.autoconfigure.web.reactive;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
import javax.validation.ValidatorFactory;
|
||||
@ -34,6 +35,7 @@ import org.springframework.core.Ordered;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.http.server.reactive.HttpHandler;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
import org.springframework.validation.Validator;
|
||||
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
|
||||
import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
|
||||
@ -59,6 +61,7 @@ import static org.mockito.Mockito.mock;
|
||||
* Tests for {@link WebFluxAnnotationAutoConfiguration}.
|
||||
*
|
||||
* @author Brian Clozel
|
||||
* @author Andy Wilkinson
|
||||
*/
|
||||
public class WebFluxAnnotationAutoConfigurationTests {
|
||||
|
||||
@ -86,16 +89,19 @@ public class WebFluxAnnotationAutoConfigurationTests {
|
||||
.isNotNull();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Test
|
||||
public void shouldRegisterCustomHandlerMethodArgumentResolver() throws Exception {
|
||||
load(CustomArgumentResolvers.class);
|
||||
RequestMappingHandlerAdapter adapter = this.context
|
||||
.getBean(RequestMappingHandlerAdapter.class);
|
||||
assertThat(adapter.getCustomArgumentResolvers()).contains(
|
||||
this.context.getBean("firstResolver",
|
||||
HandlerMethodArgumentResolver.class),
|
||||
this.context.getBean("secondResolver",
|
||||
HandlerMethodArgumentResolver.class));
|
||||
assertThat((List<HandlerMethodArgumentResolver>) ReflectionTestUtils
|
||||
.getField(adapter.getArgumentResolverConfigurer(), "customResolvers"))
|
||||
.contains(
|
||||
this.context.getBean("firstResolver",
|
||||
HandlerMethodArgumentResolver.class),
|
||||
this.context.getBean("secondResolver",
|
||||
HandlerMethodArgumentResolver.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Loading…
Reference in New Issue
Block a user