Fixes gh-1563

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/AsyncTaskExecutorAutoConfiguration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2012-2013 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.boot.autoconfigure.task;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for Async Task Executor.
+ *
+ * @author Tiarê Balbi Bonamini
+ * @see EnableAsync
+ * @see AsyncTaskExecutor
+ * @see SimpleAsyncTaskExecutor
+ */
+@Configuration
+@ConditionalOnBean(annotation = EnableAsync.class)
+@EnableConfigurationProperties(AsyncTaskExecutorProperties.class)
+public class AsyncTaskExecutorAutoConfiguration {
+
+	@Autowired
+	private AsyncTaskExecutorProperties taskProperties;
+
+	@Bean
+	@ConditionalOnMissingBean
+	public AsyncTaskExecutor simpleAsyncTaskExecutor() {
+		SimpleAsyncTaskExecutor asyncTaskExecutor = new SimpleAsyncTaskExecutor();
+		asyncTaskExecutor.setConcurrencyLimit(taskProperties.getConcurrencyLimit());
+		asyncTaskExecutor.setThreadNamePrefix(taskProperties.getThreadNamePrefix());
+		return asyncTaskExecutor;
+	}
+}

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/task/AsyncTaskExecutorProperties.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2012-2013 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.boot.autoconfigure.task;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Configuration properties for TaskExecutor
+ *
+ * @author Tiarê Balbi Bonamini
+ */
+@ConfigurationProperties(prefix = "spring.task")
+public class AsyncTaskExecutorProperties {
+
+	/**
+	 * Prefix to use for the names of newly created threads
+	 */
+	private String threadNamePrefix = "async-executor-task-";
+
+	/**
+	 * Set the maximum number of concurrent access attempts allowed. -1 indicates
+	 * unbounded concurrency.
+	 */
+	private int concurrencyLimit = -1;
+
+	public String getThreadNamePrefix() {
+		return threadNamePrefix;
+	}
+
+	public void setThreadNamePrefix(String threadNamePrefix) {
+		this.threadNamePrefix = threadNamePrefix;
+	}
+
+	public int getConcurrencyLimit() {
+		return concurrencyLimit;
+	}
+
+	public void setConcurrencyLimit(int concurrencyLimit) {
+		this.concurrencyLimit = concurrencyLimit;
+	}
+}

spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -68,6 +68,7 @@ org.springframework.boot.autoconfigure.social.LinkedInAutoConfiguration,\
 org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration,\
 org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration,\
 org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration,\
+org.springframework.boot.autoconfigure.task.AsyncTaskExecutorAutoConfiguration,\
 org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
 org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration,\
 org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration,\

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/task/AsyncTaskExecutorAutoConfigurationTest.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2012-2013 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.boot.autoconfigure.task;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.test.EnvironmentTestUtils;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * Test case for {@link AsyncTaskExecutorAutoConfiguration}
+ *
+ * @author Tiarê Balbi Bonamini
+ * @since 1.3.0
+ */
+public class AsyncTaskExecutorAutoConfigurationTest {
+
+	private AnnotationConfigApplicationContext context;
+
+	@After
+	public void close() {
+
+		if (this.context != null) {
+			this.context.close();
+		}
+	}
+
+	@Test
+	public void testTaskExecutorCreated() {
+		this.context = new AnnotationConfigApplicationContext();
+
+		this.context.register(CustomAsyncAnnotationConfig.class,
+				PropertyPlaceholderAutoConfiguration.class,
+				AsyncTaskExecutorAutoConfiguration.class);
+		this.context.refresh();
+
+		AsyncTaskExecutor bean = this.context.getBean(AsyncTaskExecutor.class);
+
+		assertNotNull(bean);
+		assertTrue(bean instanceof SimpleAsyncTaskExecutor);
+
+	}
+
+	@Test
+	public void testCustomProperties() {
+
+		this.context = new AnnotationConfigApplicationContext();
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"spring.task.concurrency-limit:30",
+				"spring.task.thread-name-prefix:spring");
+
+		this.context.register(CustomAsyncAnnotationConfig.class,
+				PropertyPlaceholderAutoConfiguration.class,
+				AsyncTaskExecutorAutoConfiguration.class);
+
+		this.context.refresh();
+
+		SimpleAsyncTaskExecutor bean = (SimpleAsyncTaskExecutor) this.context
+				.getBean(AsyncTaskExecutor.class);
+		assertEquals(30, bean.getConcurrencyLimit());
+		assertEquals("spring", bean.getThreadNamePrefix());
+
+	}
+
+	@Configuration
+	@EnableAsync
+	static class CustomAsyncAnnotationConfig {
+	}
+
+}