SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TaskBatchAutoConfiguration now uses datasource from TaskConfigurer

Browse Source 
resovles #252
This commit is contained in:
Glenn Renfro
2016-12-02 14:53:27 -05:00
committed by Michael Minella
parent ce31582995
commit 1185421803
5 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/configuration/TaskBatchAutoConfiguration.java
View File

@@ -25,7 +25,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.task.batch.listener.TaskBatchExecutionListener;
import org.springframework.cloud.task.configuration.TaskConfigurer;
import org.springframework.cloud.task.repository.TaskExplorer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.CollectionUtils;
@@ -50,20 +52,25 @@ public class TaskBatchAutoConfiguration {
@ConditionalOnMissingBean(name = "taskBatchExecutionListener")
public static class TaskBatchExecutionListenerAutoconfiguration {
@Autowired(required = false)
private Collection<DataSource> dataSources;
@Autowired
private ApplicationContext context;
@Bean
public TaskBatchExecutionListenerFactoryBean taskBatchExecutionListener(TaskExplorer taskExplorer) {
if(!CollectionUtils.isEmpty(dataSources) && dataSources.size() == 1) {
return new TaskBatchExecutionListenerFactoryBean(dataSources.iterator().next(), taskExplorer);
TaskConfigurer taskConfigurer = null;
if(!context.getBeansOfType(TaskConfigurer.class).isEmpty()) {
taskConfigurer = context.getBean(TaskConfigurer.class);
}
else if(CollectionUtils.isEmpty(dataSources)) {
return new TaskBatchExecutionListenerFactoryBean(null, taskExplorer);
if(taskConfigurer != null && taskConfigurer.getTaskDataSource() != null) {
return new TaskBatchExecutionListenerFactoryBean(
taskConfigurer.getTaskDataSource(),
taskExplorer);
}
else {
throw new IllegalStateException("Expected one datasource and found " + dataSources.size());
return new TaskBatchExecutionListenerFactoryBean(null, taskExplorer);
}
}
}
}

6
spring-cloud-task-batch/src/test/java/org/springframework/cloud/task/batch/listener/TaskBatchExecutionListenerTests.java
View File

@@ -288,11 +288,7 @@ public class TaskBatchExecutionListenerTests {
.setName("incorrectDataSource");
return builder.build();
}
@Bean
public TaskBatchExecutionListenerFactoryBean taskBatchExecutionListener(TaskExplorer taskExplorer) {
return new TaskBatchExecutionListenerFactoryBean(myDataSource(), taskExplorer);
}
@Bean
public TaskConfigurer taskConfigurer() {