@ -234,8 +234,8 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
@@ -234,8 +234,8 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
ManagedList < ? > returnValueHandlers = getReturnValueHandlers ( element , context ) ;
String asyncTimeout = getAsyncTimeout ( element ) ;
RuntimeBeanReference asyncExecutor = getAsyncExecutor ( element ) ;
ManagedList < ? > callableInterceptors = getCallable Interceptors ( element , source , context ) ;
ManagedList < ? > deferredResultInterceptors = getDeferredResult Interceptors ( element , source , context ) ;
ManagedList < ? > callableInterceptors = getInterceptors ( element , source , context , "callable-interceptors" ) ;
ManagedList < ? > deferredResultInterceptors = getInterceptors ( element , source , context , "deferred-result-interceptors" ) ;
RootBeanDefinition handlerAdapterDef = new RootBeanDefinition ( RequestMappingHandlerAdapter . class ) ;
handlerAdapterDef . setSource ( source ) ;
@ -480,34 +480,13 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
@@ -480,34 +480,13 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
return null ;
}
private ManagedList < ? > getCallableInterceptors (
Element element , @Nullable Object source , ParserContext context ) {
ManagedList < Object > interceptors = new ManagedList < > ( ) ;
Element asyncElement = DomUtils . getChildElementByTagName ( element , "async-support" ) ;
if ( asyncElement ! = null ) {
Element interceptorsElement = DomUtils . getChildElementByTagName ( asyncElement , "callable-interceptors" ) ;
if ( interceptorsElement ! = null ) {
interceptors . setSource ( source ) ;
for ( Element converter : DomUtils . getChildElementsByTagName ( interceptorsElement , "bean" ) ) {
BeanDefinitionHolder beanDef = context . getDelegate ( ) . parseBeanDefinitionElement ( converter ) ;
if ( beanDef ! = null ) {
beanDef = context . getDelegate ( ) . decorateBeanDefinitionIfRequired ( converter , beanDef ) ;
interceptors . add ( beanDef ) ;
}
}
}
}
return interceptors ;
}
private ManagedList < ? > getDeferredResultInterceptors (
Element element , @Nullable Object source , ParserContext context ) {
private ManagedList < ? > getInterceptors (
Element element , @Nullable Object source , ParserContext context , String interceptorElementName ) {
ManagedList < Object > interceptors = new ManagedList < > ( ) ;
Element asyncElement = DomUtils . getChildElementByTagName ( element , "async-support" ) ;
if ( asyncElement ! = null ) {
Element interceptorsElement = DomUtils . getChildElementByTagName ( asyncElement , "deferred-result-interceptors" ) ;
Element interceptorsElement = DomUtils . getChildElementByTagName ( asyncElement , interceptorElementName ) ;
if ( interceptorsElement ! = null ) {
interceptors . setSource ( source ) ;
for ( Element converter : DomUtils . getChildElementsByTagName ( interceptorsElement , "bean" ) ) {