Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added detectInterceptors compatibility check

Browse Source
This commit is contained in:
Keith Donald
2009-11-27 17:04:48 +00:00
parent 5e1c00ceb2
commit 57f0a7d94b
9 changed files with 38 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java
View File

@@ -55,7 +55,7 @@ import org.w3c.dom.Element;
public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
private static final boolean jsr303Present = ClassUtils.isPresent(
"javax.validation.Validator", InterceptorsBeanDefinitionParser.class.getClassLoader());
"javax.validation.Validator", AnnotationDrivenBeanDefinitionParser.class.getClassLoader());
public BeanDefinition parse(Element element, ParserContext parserContext) {
@@ -64,6 +64,7 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
RootBeanDefinition annMappingDef = new RootBeanDefinition(DefaultAnnotationHandlerMapping.class);
annMappingDef.setSource(source);
annMappingDef.getPropertyValues().add("order", 0);
annMappingDef.getPropertyValues().add("detectInterceptors", true);
String annMappingName = parserContext.getReaderContext().registerWithGeneratedName(annMappingDef);
RootBeanDefinition bindingDef = new RootBeanDefinition(ConfigurableWebBindingInitializer.class);

49
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java
View File

@@ -1,49 +0,0 @@
/*
* Copyright 2002-2009 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.web.servlet.config;
import java.util.List;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.xml.BeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.util.xml.DomUtils;
import org.springframework.web.servlet.HandlerInterceptor;
import org.w3c.dom.Element;
/**
* {@link org.springframework.beans.factory.xml.BeanDefinitionParser} that parses the {@code interceptors} element to configure
* a set of global Spring MVC {@link HandlerInterceptor HandlerInterceptors}.
* The set is expected to be configured by type on each registered HandlerMapping.
*
* @author Keith Donald
* @since 3.0
*/
class InterceptorsBeanDefinitionParser implements BeanDefinitionParser {
public BeanDefinition parse(Element element, ParserContext parserContext) {
List<Element> beans = DomUtils.getChildElementsByTagName(element, "bean");
for (Element bean : beans) {
BeanDefinitionHolder beanHolder = parserContext.getDelegate().parseBeanDefinitionElement(bean);
parserContext.getDelegate().decorateBeanDefinitionIfRequired(bean, beanHolder);
parserContext.getReaderContext().registerWithGeneratedName(beanHolder.getBeanDefinition());
}
return null;
}
}

1
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/MvcNamespaceHandler.java
View File

@@ -29,7 +29,6 @@ public class MvcNamespaceHandler extends NamespaceHandlerSupport {
public void init() {
registerBeanDefinitionParser("annotation-driven", new AnnotationDrivenBeanDefinitionParser());
registerBeanDefinitionParser("interceptors", new InterceptorsBeanDefinitionParser());
registerBeanDefinitionParser("view-controller", new ViewControllerBeanDefinitionParser());
}

1
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/ViewControllerBeanDefinitionParser.java
View File

@@ -53,6 +53,7 @@ class ViewControllerBeanDefinitionParser implements BeanDefinitionParser {
handlerMappingDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
handlerMappingDef.setSource(source);
handlerMappingDef.getPropertyValues().add("order", "1");
handlerMappingDef.getPropertyValues().add("detectInterceptors", true);
this.handlerMappingBeanName = parserContext.getReaderContext().registerWithGeneratedName(handlerMappingDef);
} else {
handlerMappingDef = (RootBeanDefinition) parserContext.getReaderContext().getRegistry().getBeanDefinition(this.handlerMappingBeanName);

25
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
View File

@@ -57,6 +57,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
private HandlerInterceptor[] adaptedInterceptors;
private boolean detectInterceptors;
/**
* Specify the order value for this HandlerMapping bean.
@@ -100,6 +101,15 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
this.interceptors.addAll(Arrays.asList(interceptors));
}
/**
* Configure whether this handler mapping should detect interceptors registered in the WebApplicationContext.
* If true, {@link HandlerInterceptor} and {@link WebRequestInterceptor} beans will be detected by type and added to the interceptors list.
* Default is false.
* @param detectInterceptors the detect interceptors flag
*/
public void setDetectInterceptors(boolean detectInterceptors) {
this.detectInterceptors = detectInterceptors;
}
/**
* Initializes the interceptors.
@@ -131,10 +141,17 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* @see #adaptInterceptor
*/
protected void initInterceptors() {
// TODO consider impact on backwards compatibility here
Map<String, HandlerInterceptor> globalInterceptors = getApplicationContext().getBeansOfType(HandlerInterceptor.class);
if (globalInterceptors != null) {
this.interceptors.addAll(globalInterceptors.values());
if (this.detectInterceptors) {
Map<String, HandlerInterceptor> handlerInterceptors = getApplicationContext().getBeansOfType(HandlerInterceptor.class);
if (handlerInterceptors != null && !handlerInterceptors.isEmpty()) {
this.interceptors.addAll(handlerInterceptors.values());
}
Map<String, WebRequestInterceptor> webInterceptors = getApplicationContext().getBeansOfType(WebRequestInterceptor.class);
if (webInterceptors != null && !webInterceptors.isEmpty()) {
for (WebRequestInterceptor interceptor : webInterceptors.values()) {
this.interceptors.add(new WebRequestHandlerInterceptorAdapter(interceptor));
}
}
}
if (!this.interceptors.isEmpty()) {