Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - issue SPR-5917: DataSourceInitializer and namespace support for creating and populating databases

Browse Source 
Tweak initializer to allow placeholders for script locations
This commit is contained in:
David Syer
2009-10-30 11:09:49 +00:00
parent 0c8a320130
commit 747f71f9d2
3 changed files with 99 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
org.springframework.jdbc/src/main/java/org/springframework/jdbc/config/InitializeDatabaseBeanDefinitionParser.java
View File

@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -32,7 +33,6 @@ import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.jdbc.datasource.init.DataSourceInitializer;
import org.springframework.jdbc.datasource.init.DatabasePopulator;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.util.xml.DomUtils;
import org.w3c.dom.Element;
@@ -67,36 +67,27 @@ public class InitializeDatabaseBeanDefinitionParser extends AbstractBeanDefiniti
}
}
private DatabasePopulator createDatabasePopulator(Element element, List<Element> scripts, ParserContext context) {
ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
populator.setIgnoreFailedDrops(element.getAttribute("ignore-failures").equals("DROPS"));
populator.setContinueOnError(element.getAttribute("ignore-failures").equals("ALL"));
private BeanDefinition createDatabasePopulator(Element element, List<Element> scripts, ParserContext context) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(ResourceDatabasePopulator.class);
builder.addPropertyValue("ignoreFailedDrops", element.getAttribute("ignore-failures").equals("DROPS"));
builder.addPropertyValue("continueOnError", element.getAttribute("ignore-failures").equals("ALL"));
List<String> locations = new ArrayList<String>();
for (Element scriptElement : scripts) {
String location = scriptElement.getAttribute("location");
ResourceLoader resourceLoader = context.getReaderContext().getResourceLoader();
if (resourceLoader instanceof ResourcePatternResolver) {
try {
List<Resource> resources = new ArrayList<Resource>(Arrays.asList(((ResourcePatternResolver)resourceLoader).getResources(location)));
Collections.<Resource>sort(resources, new Comparator<Resource>() {
public int compare(Resource o1, Resource o2) {
try {
return o1.getURL().toString().compareTo(o2.getURL().toString());
} catch (IOException e) {
return 0;
}
}
});
for (Resource resource : resources) {
populator.addScript(resource);
}
} catch (IOException e) {
context.getReaderContext().error("Cannot locate resources for script from location="+location, scriptElement);
}
} else {
populator.addScript(resourceLoader.getResource(location));
}
locations.add(location);
}
return populator;
// Use a factor bean for the resources so they can be given an order if a pattern is used
BeanDefinitionBuilder resourcesFactory = BeanDefinitionBuilder
.genericBeanDefinition(SortedResourcesFactoryBean.class);
resourcesFactory.addConstructorArgValue(context.getReaderContext().getResourceLoader());
resourcesFactory.addConstructorArgValue(locations);
builder.addPropertyValue("scripts", resourcesFactory.getBeanDefinition());
return builder.getBeanDefinition();
}
private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
@@ -106,4 +97,52 @@ public class InitializeDatabaseBeanDefinitionParser extends AbstractBeanDefiniti
return definition;
}
public static class SortedResourcesFactoryBean implements FactoryBean<Resource[]> {
private ResourceLoader resourceLoader;
private List<String> locations;
public SortedResourcesFactoryBean(ResourceLoader resourceLoader, List<String> locations) {
super();
this.resourceLoader = resourceLoader;
this.locations = locations;
}
public Resource[] getObject() throws Exception {
List<Resource> scripts = new ArrayList<Resource>();
for (String location : locations) {
if (resourceLoader instanceof ResourcePatternResolver) {
List<Resource> resources = new ArrayList<Resource>(Arrays
.asList(((ResourcePatternResolver) resourceLoader).getResources(location)));
Collections.<Resource> sort(resources, new Comparator<Resource>() {
public int compare(Resource o1, Resource o2) {
try {
return o1.getURL().toString().compareTo(o2.getURL().toString());
} catch (IOException e) {
return 0;
}
}
});
for (Resource resource : resources) {
scripts.add(resource);
}
} else {
scripts.add(resourceLoader.getResource(location));
}
}
return scripts.toArray(new Resource[scripts.size()]);
}
public Class<? extends Resource[]> getObjectType() {
// TODO Auto-generated method stub
return null;
}
public boolean isSingleton() {
// TODO Auto-generated method stub
return false;
}
}
}