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

Code formatting

This commit is contained in:
Phillip Webb 2013-08-22 02:41:58 -07:00
parent 9e18183dd5
commit be79da139e
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
View File

@ -154,7 +154,8 @@ class BeanDefinitionLoader {
} }
private int load(CharSequence source) { private int load(CharSequence source) {
String sourceString = xmlReader.getEnvironment().resolvePlaceholders(source.toString()); String sourceString = this.xmlReader.getEnvironment().resolvePlaceholders(
source.toString());
try { try {
// Use class utils so that period separated nested class names work // Use class utils so that period separated nested class names work
return load(ClassUtils.forName(sourceString, null)); return load(ClassUtils.forName(sourceString, null));
@ -163,37 +164,40 @@ class BeanDefinitionLoader {
// swallow exception and continue // swallow exception and continue
} }
ResourceLoader loader = this.resourceLoader != null ? ResourceLoader loader = this.resourceLoader != null ? this.resourceLoader
this.resourceLoader : DEFAULT_RESOURCE_LOADER; : DEFAULT_RESOURCE_LOADER;
int loadCount = 0; int loadCount = 0;
if( loader instanceof ResourcePatternResolver ) { if (loader instanceof ResourcePatternResolver) {
// Resource pattern matching available. // Resource pattern matching available.
try { try {
Resource[] resources = ((ResourcePatternResolver) loader).getResources(sourceString); Resource[] resources = ((ResourcePatternResolver) loader)
for(Resource resource : resources) { .getResources(sourceString);
if( resource.exists() ) { for (Resource resource : resources) {
if (resource.exists()) {
loadCount += load(resource); loadCount += load(resource);
} }
} }
} }
catch (IOException ex) { catch (IOException ex) {
throw new BeanDefinitionStoreException( throw new BeanDefinitionStoreException(
"Could not resolve bean definition resource pattern [" + sourceString + "]", ex); "Could not resolve bean definition resource pattern ["
+ sourceString + "]", ex);
} }
} }
if( !(loader instanceof ResourcePatternResolver) ) { if (!(loader instanceof ResourcePatternResolver)) {
// Can only load single resources by absolute URL. // Can only load single resources by absolute URL.
Resource loadedResource = loader.getResource(sourceString); Resource loadedResource = loader.getResource(sourceString);
if (loadedResource != null && loadedResource.exists()) { if (loadedResource != null && loadedResource.exists()) {
return load(loadedResource); return load(loadedResource);
} }
} }
if( loadCount > 0 ) { if (loadCount > 0) {
return loadCount; return loadCount;
} }
else { else {
// Attempt to treat the source as a package name, common to all PatternResolver types // Attempt to treat the source as a package name, common to all
// PatternResolver types
Package packageResource = findPackage(source); Package packageResource = findPackage(source);
if (packageResource != null) { if (packageResource != null) {
return load(packageResource); return load(packageResource);

2
spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
View File

@ -275,7 +275,7 @@ public class SpringApplicationTests {
application, "initialSources"); application, "initialSources");
assertThat(initialSources.toArray(), equalTo(sources)); assertThat(initialSources.toArray(), equalTo(sources));
} }
@Test @Test
public void wildcardSources() { public void wildcardSources() {
Object[] sources = { "classpath:org/springframework/boot/sample-${sample.app.test.prop}.xml" }; Object[] sources = { "classpath:org/springframework/boot/sample-${sample.app.test.prop}.xml" };