root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Be slightly more defensive in DataSource initialization 

Adding an Order to the BeanPostProcessor and catching an exception
are enough to get a simple web app with @EnableGlobalMethodSecurity
and JDBC user details running. It actually doesn't solve an underlying
problem in Spring Security, but I'll deal with that separately.

See gh-1115
This commit is contained in:
Dave Syer 2014-06-19 14:24:01 +01:00
parent af825fa439
commit c6175073ae
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
View File

@ -26,8 +26,8 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.io.Resource; import org.springframework.core.io.Resource;
import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
@ -48,7 +48,7 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
private static Log logger = LogFactory.getLog(DataSourceInitializer.class); private static Log logger = LogFactory.getLog(DataSourceInitializer.class);
@Autowired @Autowired
private ApplicationContext applicationContext; private ConfigurableApplicationContext applicationContext;
@Autowired(required = false) @Autowired(required = false)
private DataSource dataSource; private DataSource dataSource;
@ -75,8 +75,14 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
List<Resource> scripts = getScripts(this.properties.getSchema(), "schema"); List<Resource> scripts = getScripts(this.properties.getSchema(), "schema");
if (!scripts.isEmpty()) { if (!scripts.isEmpty()) {
runScripts(scripts); runScripts(scripts);
this.applicationContext.publishEvent(new DataSourceInitializedEvent( try {
this.dataSource)); this.applicationContext.publishEvent(new DataSourceInitializedEvent(
this.dataSource));
}
catch (IllegalStateException e) {
logger.warn("Could not send event to complete DataSource initialization ("
+ e.getMessage() + ")");
}
} }
} }

10
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerPostProcessor.java
View File

@ -26,6 +26,7 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.core.Ordered;
import org.springframework.core.type.AnnotationMetadata; import org.springframework.core.type.AnnotationMetadata;
/** /**
@ -35,7 +36,14 @@ import org.springframework.core.type.AnnotationMetadata;
* @author Dave Syer * @author Dave Syer
* @since 1.1.2 * @since 1.1.2
*/ */
class DataSourceInitializerPostProcessor implements BeanPostProcessor { class DataSourceInitializerPostProcessor implements BeanPostProcessor, Ordered {
private int order = Ordered.HIGHEST_PRECEDENCE;
@Override
public int getOrder() {
return this.order;
}
@Autowired @Autowired
private BeanFactory beanFactory; private BeanFactory beanFactory;