Add exception-handler attribute support for AspectJ

Previously, the exception-handler attribute was not taken care of when
task:annotation-driven is used in AspectJ mode. This commit provides the
expected behavior.

Issue: SPR-12619

spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationDrivenBeanDefinitionParserTests.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2002-2015 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.scheduling.aspectj;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.scheduling.config.TaskManagementConfigUtils;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Stephane Nicoll
+ */
+public class AnnotationDrivenBeanDefinitionParserTests {
+
+	private ConfigurableApplicationContext context;
+
+	@Before
+	public void setup() {
+		this.context = new ClassPathXmlApplicationContext(
+				"annotationDrivenContext.xml", AnnotationDrivenBeanDefinitionParserTests.class);
+	}
+
+	@After
+	public void after() {
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void asyncAspectRegistered() {
+		assertTrue(context.containsBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME));
+	}
+
+	@Test
+	public void asyncPostProcessorExecutorReference() {
+		Object executor = context.getBean("testExecutor");
+		Object aspect = context.getBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME);
+		assertSame(executor, new DirectFieldAccessor(aspect).getPropertyValue("defaultExecutor"));
+	}
+
+	@Test
+	public void asyncPostProcessorExceptionHandlerReference() {
+		Object exceptionHandler = context.getBean("testExceptionHandler");
+		Object aspect = context.getBean(TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME);
+		assertSame(exceptionHandler, new DirectFieldAccessor(aspect).getPropertyValue("exceptionHandler"));
+	}
+
+}

spring-aspects/src/test/java/org/springframework/scheduling/aspectj/annotationDrivenContext.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:task="http://www.springframework.org/schema/task"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   			http://www.springframework.org/schema/beans/spring-beans.xsd
+				http://www.springframework.org/schema/task
+				http://www.springframework.org/schema/task/spring-task.xsd">
+
+	<task:annotation-driven mode="aspectj" executor="testExecutor"
+							exception-handler="testExceptionHandler"/>
+
+	<task:executor id="testExecutor"/>
+
+	<bean id="testExceptionHandler"
+		  class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
+
+</beans>

spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -115,6 +115,10 @@ public class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParse
 			if (StringUtils.hasText(executor)) {
 				builder.addPropertyReference("executor", executor);
 			}
+			String exceptionHandler = element.getAttribute("exception-handler");
+			if (StringUtils.hasText(exceptionHandler)) {
+				builder.addPropertyReference("exceptionHandler", exceptionHandler);
+			}
 			parserContext.registerBeanComponent(new BeanComponentDefinition(builder.getBeanDefinition(),
 					TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME));
 		}

spring-context/src/test/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -27,6 +27,7 @@ import static org.junit.Assert.*;
 
 /**
  * @author Mark Fisher
+ * @author Stephane Nicoll
  */
 public class AnnotationDrivenBeanDefinitionParserTests {
 
@@ -64,4 +65,11 @@ public class AnnotationDrivenBeanDefinitionParserTests {
 		assertSame(scheduler, new DirectFieldAccessor(postProcessor).getPropertyValue("scheduler"));
 	}
 
+	@Test
+	public void asyncPostProcessorExceptionHandlerReference() {
+		Object exceptionHandler = context.getBean("testExceptionHandler");
+		Object postProcessor = context.getBean(TaskManagementConfigUtils.ASYNC_ANNOTATION_PROCESSOR_BEAN_NAME);
+		assertSame(exceptionHandler, new DirectFieldAccessor(postProcessor).getPropertyValue("exceptionHandler"));
+	}
+
 }

spring-context/src/test/resources/org/springframework/scheduling/config/annotationDrivenContext.xml

@@ -7,10 +7,14 @@
 				http://www.springframework.org/schema/task
 				http://www.springframework.org/schema/task/spring-task.xsd">
 
-	<task:annotation-driven executor="testExecutor" scheduler="testScheduler"/>
+	<task:annotation-driven executor="testExecutor" scheduler="testScheduler"
+							exception-handler="testExceptionHandler"/>
 
 	<task:executor id="testExecutor"/>
 
 	<task:scheduler id="testScheduler"/>
 
+	<bean id="testExceptionHandler"
+		  class="org.springframework.aop.interceptor.SimpleAsyncUncaughtExceptionHandler"/>
+
 </beans>