From 610fa618aae58af50c12ee8d0c29d12b7460fd8a Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Mon, 30 Jan 2012 17:55:34 -0500 Subject: [PATCH] SPR-9056 Make DelegatingWebMvcConfiguration config callbacks not final It should be possible to progress from extending WebMvcConfigurerAdapter (w/ @EnableWebMvc) to extending WebMvcConfigurationSupport directly, to extending DelegatingWebMvcConfigurationSupport. This change makes that possible. --- .../DelegatingWebMvcConfiguration.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java index 5571532ed7..68d2043269 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java @@ -51,52 +51,52 @@ public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport { } @Override - protected final void addInterceptors(InterceptorRegistry registry) { + protected void addInterceptors(InterceptorRegistry registry) { configurers.addInterceptors(registry); } @Override - protected final void addViewControllers(ViewControllerRegistry registry) { + protected void addViewControllers(ViewControllerRegistry registry) { configurers.addViewControllers(registry); } @Override - protected final void addResourceHandlers(ResourceHandlerRegistry registry) { + protected void addResourceHandlers(ResourceHandlerRegistry registry) { configurers.addResourceHandlers(registry); } @Override - protected final void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { + protected void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) { configurers.configureDefaultServletHandling(configurer); } @Override - protected final void addArgumentResolvers(List argumentResolvers) { + protected void addArgumentResolvers(List argumentResolvers) { configurers.addArgumentResolvers(argumentResolvers); } @Override - protected final void addReturnValueHandlers(List returnValueHandlers) { + protected void addReturnValueHandlers(List returnValueHandlers) { configurers.addReturnValueHandlers(returnValueHandlers); } @Override - protected final void configureMessageConverters(List> converters) { + protected void configureMessageConverters(List> converters) { configurers.configureMessageConverters(converters); } @Override - protected final void addFormatters(FormatterRegistry registry) { + protected void addFormatters(FormatterRegistry registry) { configurers.addFormatters(registry); } @Override - protected final Validator getValidator() { + protected Validator getValidator() { return configurers.getValidator(); } @Override - protected final void configureHandlerExceptionResolvers(List exceptionResolvers) { + protected void configureHandlerExceptionResolvers(List exceptionResolvers) { configurers.configureHandlerExceptionResolvers(exceptionResolvers); }