GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Replace "mvc" in web rective config bean names

pull/1203/head
Rossen Stoyanchev 9 years ago
parent
1de73b9b4f
commit
cabb253269
2 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
  2. 10
      spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java

24
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
Unescape View File

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

10
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save