Replace "mvc" in web rective config bean names

Author: rstoyanchev

spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java

@@ -120,7 +120,7 @@ protected ApplicationContext getApplicationContext() {
 	public RequestMappingHandlerMapping requestMappingHandlerMapping() {
 		RequestMappingHandlerMapping mapping = createRequestMappingHandlerMapping();
 		mapping.setOrder(0);
-		mapping.setContentTypeResolver(mvcContentTypeResolver());
+		mapping.setContentTypeResolver(webReactiveContentTypeResolver());
 		mapping.setCorsConfigurations(getCorsConfigurations());
 
 		PathMatchConfigurer configurer = getPathMatchConfigurer();
@@ -151,7 +151,7 @@ protected RequestMappingHandlerMapping createRequestMappingHandlerMapping() {
 	}
 
 	@Bean
-	public CompositeContentTypeResolver mvcContentTypeResolver() {
+	public CompositeContentTypeResolver webReactiveContentTypeResolver() {
 		RequestedContentTypeResolverBuilder builder = new RequestedContentTypeResolverBuilder();
 		builder.mediaTypes(getDefaultMediaTypeMappings());
 		configureRequestedContentTypeResolver(builder);
@@ -222,7 +222,7 @@ public void configurePathMatching(PathMatchConfigurer configurer) {
 	@Bean
 	public HandlerMapping resourceHandlerMapping() {
 		ResourceHandlerRegistry registry =
-				new ResourceHandlerRegistry(this.applicationContext, mvcContentTypeResolver());
+				new ResourceHandlerRegistry(this.applicationContext, webReactiveContentTypeResolver());
 		addResourceHandlers(registry);
 
 		AbstractHandlerMapping handlerMapping = registry.getHandlerMapping();
@@ -261,8 +261,8 @@ public RequestMappingHandlerAdapter requestMappingHandlerAdapter() {
 
 		adapter.setMessageReaders(getMessageReaders());
 		adapter.setWebBindingInitializer(getConfigurableWebBindingInitializer());
-		adapter.setConversionService(mvcConversionService());
-		adapter.setValidator(mvcValidator());
+		adapter.setConversionService(webReactiveConversionService());
+		adapter.setValidator(webReactiveValidator());
 
 		return adapter;
 	}
@@ -338,14 +338,14 @@ protected void extendMessageReaders(List<HttpMessageReader<?>> messageReaders) {
 	 */
 	protected ConfigurableWebBindingInitializer getConfigurableWebBindingInitializer() {
 		ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer();
-		initializer.setConversionService(mvcConversionService());
-		initializer.setValidator(mvcValidator());
+		initializer.setConversionService(webReactiveConversionService());
+		initializer.setValidator(webReactiveValidator());
 		initializer.setMessageCodesResolver(getMessageCodesResolver());
 		return initializer;
 	}
 
 	@Bean
-	public FormattingConversionService mvcConversionService() {
+	public FormattingConversionService webReactiveConversionService() {
 		FormattingConversionService service = new DefaultFormattingConversionService();
 		addFormatters(service);
 		return service;
@@ -366,7 +366,7 @@ protected void addFormatters(FormatterRegistry registry) {
 	 * implementation is not available, a "no-op" {@link Validator} is returned.
 	 */
 	@Bean
-	public Validator mvcValidator() {
+	public Validator webReactiveValidator() {
 		Validator validator = getValidator();
 		if (validator == null) {
 			if (ClassUtils.isPresent("javax.validation.Validator", getClass().getClassLoader())) {
@@ -411,12 +411,12 @@ public SimpleHandlerAdapter simpleHandlerAdapter() {
 
 	@Bean
 	public ResponseEntityResultHandler responseEntityResultHandler() {
-		return new ResponseEntityResultHandler(getMessageWriters(), mvcContentTypeResolver());
+		return new ResponseEntityResultHandler(getMessageWriters(), webReactiveContentTypeResolver());
 	}
 
 	@Bean
 	public ResponseBodyResultHandler responseBodyResultHandler() {
-		return new ResponseBodyResultHandler(getMessageWriters(), mvcContentTypeResolver());
+		return new ResponseBodyResultHandler(getMessageWriters(), webReactiveContentTypeResolver());
 	}
 
 	/**
@@ -479,7 +479,7 @@ public ViewResolutionResultHandler viewResolutionResultHandler() {
 		ViewResolverRegistry registry = new ViewResolverRegistry(getApplicationContext());
 		configureViewResolvers(registry);
 		List<ViewResolver> resolvers = registry.getViewResolvers();
-		ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, mvcContentTypeResolver());
+		ViewResolutionResultHandler handler = new ViewResolutionResultHandler(resolvers, webReactiveContentTypeResolver());
 		handler.setDefaultViews(registry.getDefaultViews());
 		handler.setOrder(registry.getOrder());
 		return handler;

spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java

@@ -113,7 +113,7 @@ public void requestMappingHandlerMapping() throws Exception {
 		assertTrue(mapping.useTrailingSlashMatch());
 		assertTrue(mapping.useRegisteredSuffixPatternMatch());
 
-		name = "mvcContentTypeResolver";
+		name = "webReactiveContentTypeResolver";
 		RequestedContentTypeResolver resolver = context.getBean(name, RequestedContentTypeResolver.class);
 		assertSame(resolver, mapping.getContentTypeResolver());
 
@@ -155,11 +155,11 @@ public void requestMappingHandlerAdapter() throws Exception {
 		assertHasMessageReader(readers, TestBean.class, APPLICATION_JSON);
 		assertHasMessageReader(readers, TestBean.class, null);
 
-		name = "mvcConversionService";
+		name = "webReactiveConversionService";
 		ConversionService service = context.getBean(name, ConversionService.class);
 		assertSame(service, adapter.getConversionService());
 
-		name = "mvcValidator";
+		name = "webReactiveValidator";
 		Validator validator = context.getBean(name, Validator.class);
 		assertSame(validator, adapter.getValidator());
 		assertEquals(OptionalValidatorFactoryBean.class, validator.getClass());
@@ -207,7 +207,7 @@ public void responseEntityResultHandler() throws Exception {
 		assertHasMessageWriter(writers, TestBean.class, APPLICATION_JSON);
 		assertHasMessageWriter(writers, TestBean.class, MediaType.parseMediaType("text/event-stream"));
 
-		name = "mvcContentTypeResolver";
+		name = "webReactiveContentTypeResolver";
 		RequestedContentTypeResolver resolver = context.getBean(name, RequestedContentTypeResolver.class);
 		assertSame(resolver, handler.getContentTypeResolver());
 	}
@@ -232,7 +232,7 @@ public void responseBodyResultHandler() throws Exception {
 		assertHasMessageWriter(writers, TestBean.class, APPLICATION_JSON);
 		assertHasMessageWriter(writers, TestBean.class, null);
 
-		name = "mvcContentTypeResolver";
+		name = "webReactiveContentTypeResolver";
 		RequestedContentTypeResolver resolver = context.getBean(name, RequestedContentTypeResolver.class);
 		assertSame(resolver, handler.getContentTypeResolver());
 	}