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

Allow <jdbc:embedded-database> to be declared w/o id

Browse Source 
This commit modifies EmbeddedDatabaseBeanDefinitionParser so that the
<jdbc:embedded-database> XML namespace element can be declared as an
anonymous bean (i.e., without an explicit ID).

Issue: SPR-12834
This commit is contained in:
Sam Brannen
2015-03-20 15:48:04 +01:00
parent 85e4b24abb
commit 7e2f12cf9f
3 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2011 the original author or authors.
* Copyright 2002-2015 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.
@@ -16,8 +16,6 @@
package org.springframework.jdbc.config;
import org.w3c.dom.Element;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -27,27 +25,39 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseFactoryBean;
import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
import org.springframework.util.StringUtils;
import org.w3c.dom.Element;
/**
* {@link org.springframework.beans.factory.xml.BeanDefinitionParser} that parses an {@code embedded-database}
* element and creates a {@link BeanDefinition} for {@link EmbeddedDatabaseFactoryBean}. Picks up nested
* {@code script} elements and configures a {@link ResourceDatabasePopulator} for them.
* {@link org.springframework.beans.factory.xml.BeanDefinitionParser} that
* parses an {@code embedded-database} element and creates a {@link BeanDefinition}
* for an {@link EmbeddedDatabaseFactoryBean}.
*
* <p>Picks up nested {@code script} elements and configures a
* {@link ResourceDatabasePopulator} for each of them.
*
* @author Oliver Gierke
* @author Juergen Hoeller
* @author Sam Brannen
* @since 3.0
* @see DatabasePopulatorConfigUtils
*/
class EmbeddedDatabaseBeanDefinitionParser extends AbstractBeanDefinitionParser {
@Override
protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(EmbeddedDatabaseFactoryBean.class);
useIdAsDatabaseNameIfGiven(element, builder);
setDatabaseType(element, builder);
DatabasePopulatorConfigUtils.setDatabasePopulator(element, builder);
useIdAsDatabaseNameIfGiven(element, builder);
builder.getRawBeanDefinition().setSource(parserContext.extractSource(element));
return builder.getBeanDefinition();
}
@Override
protected boolean shouldGenerateIdAsFallback() {
return true;
}
private void useIdAsDatabaseNameIfGiven(Element element, BeanDefinitionBuilder builder) {
String id = element.getAttribute(ID_ATTRIBUTE);
if (StringUtils.hasText(id)) {