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

Introduce database-name in <jdbc:embedded-database>

Browse Source 
Prior to this commit, the EmbeddedDatabaseBeanDefinitionParser set the
name of the embedded database that it configured to the value of its
'id'. This made it impossible to assign unique names to embedded
databases if the same bean 'id' (e.g, 'dataSource') was used across
multiple application contexts loaded within the same JVM, which is
often the case within an integration test suite. In contrast, the
EmbeddedDatabaseBuilder already provides support for setting the name
in Java Config. Thus there is a disconnect between XML and Java
configuration.

This commit addresses this issue by introducing a 'database-name'
attribute in <jdbc:embedded-database />. This allows developers to set
unique names for embedded databases -- for example, via a SpEL
expression or a property placeholder that is influenced by the current
active bean definition profiles.

Issue: SPR-12835
This commit is contained in:
Sam Brannen
2015-03-20 16:42:04 +01:00
parent 7e2f12cf9f
commit c36c6cbfaa
6 changed files with 80 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-jdbc/src/main/java/org/springframework/jdbc/config/EmbeddedDatabaseBeanDefinitionParser.java
View File

@@ -43,10 +43,16 @@ import org.w3c.dom.Element;
*/
class EmbeddedDatabaseBeanDefinitionParser extends AbstractBeanDefinitionParser {
/**
* Constant for the "database-name" attribute.
*/
static final String DB_NAME_ATTRIBUTE = "database-name";
@Override
protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(EmbeddedDatabaseFactoryBean.class);
useIdAsDatabaseNameIfGiven(element, builder);
setDatabaseName(element, builder);
setDatabaseType(element, builder);
DatabasePopulatorConfigUtils.setDatabasePopulator(element, builder);
builder.getRawBeanDefinition().setSource(parserContext.extractSource(element));
@@ -58,11 +64,20 @@ class EmbeddedDatabaseBeanDefinitionParser extends AbstractBeanDefinitionParser
return true;
}
private void useIdAsDatabaseNameIfGiven(Element element, BeanDefinitionBuilder builder) {
String id = element.getAttribute(ID_ATTRIBUTE);
if (StringUtils.hasText(id)) {
builder.addPropertyValue("databaseName", id);
private void setDatabaseName(Element element, BeanDefinitionBuilder builder) {
// 1) Check for an explicit database name
String name = element.getAttribute(DB_NAME_ATTRIBUTE);
// 2) Fall back to an implicit database name based on the ID
if (!StringUtils.hasText(name)) {
name = element.getAttribute(ID_ATTRIBUTE);
}
if (StringUtils.hasText(name)) {
builder.addPropertyValue("databaseName", name);
}
// 3) Let EmbeddedDatabaseFactory set the default "testdb" name
}
private void setDatabaseType(Element element, BeanDefinitionBuilder builder) {