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

Groovy loader should delegate to XML loader in the TCF 

If a resource location in the MergedContextConfiguration has a ".xml"
extension, the GenericGroovyXmlContextLoader now delegates to a
dedicated XmlBeanDefinitionReader for loading bean definitions from that
resource, thus preserving XML validation for all XML resource locations.
For all other extensions (presumably only ".groovy"), the
GenericGroovyXmlContextLoader delegates to a GroovyBeanDefinitionReader.

Issue: SPR-11233
This commit is contained in:
Sam Brannen 2014-07-28 17:55:57 +03:00
parent 9fa4dad13c
commit f862a009a7
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.java
View File

@ -17,8 +17,10 @@
package org.springframework.test.context.support; package org.springframework.test.context.support;
import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader; import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader;
import org.springframework.beans.factory.support.BeanDefinitionReader; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.GenericApplicationContext;
import org.springframework.test.context.MergedContextConfiguration;
import org.springframework.util.StringUtils;
/** /**
* Concrete implementation of {@link AbstractGenericContextLoader} that reads * Concrete implementation of {@link AbstractGenericContextLoader} that reads
@ -36,12 +38,30 @@ import org.springframework.context.support.GenericApplicationContext;
public class GenericGroovyXmlContextLoader extends GenericXmlContextLoader { public class GenericGroovyXmlContextLoader extends GenericXmlContextLoader {
/** /**
* Create a new {@link GroovyBeanDefinitionReader}. * Load bean definitions into the supplied {@link GenericApplicationContext context}
* @return a new {@code GroovyBeanDefinitionReader} * from the locations in the supplied {@code MergedContextConfiguration}.
*
* <p>If a location ends with the suffix {@code ".xml"}, bean definitions
* will be loaded from that location using an {@link XmlBeanDefinitionReader};
* otherwise, a {@link GroovyBeanDefinitionReader} will be used.
*
* @param context the context into which the bean definitions should be loaded
* @param mergedConfig the merged context configuration
* @see org.springframework.test.context.support.AbstractGenericContextLoader#loadBeanDefinitions
*/ */
@Override @Override
protected BeanDefinitionReader createBeanDefinitionReader(final GenericApplicationContext context) { protected void loadBeanDefinitions(GenericApplicationContext context, MergedContextConfiguration mergedConfig) {
return new GroovyBeanDefinitionReader(context); XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(context);
GroovyBeanDefinitionReader groovyReader = new GroovyBeanDefinitionReader(context);
for (String location : mergedConfig.getLocations()) {
if (StringUtils.endsWithIgnoreCase(location, ".xml")) {
xmlReader.loadBeanDefinitions(location);
}
else {
groovyReader.loadBeanDefinitions(location);
}
}
} }
/** /**