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

Merge pull request #32846 from izeye

Browse Source 
* gh-32846:
  Polish "Remove spring.xml.ignore flag usages"

Closes gh-32846
This commit is contained in:
Moritz Halbritter
2022-10-27 16:28:46 +02:00
parent 1cb149596d 7dd083ad69
commit b76259457e
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,9 +98,7 @@ class BeanDefinitionLoader {
void setBeanNameGenerator(BeanNameGenerator beanNameGenerator) {
this.annotatedReader.setBeanNameGenerator(beanNameGenerator);
this.scanner.setBeanNameGenerator(beanNameGenerator);
if (this.xmlReader != null) {
this.xmlReader.setBeanNameGenerator(beanNameGenerator);
}
this.xmlReader.setBeanNameGenerator(beanNameGenerator);
}
/**
@@ -110,9 +108,7 @@ class BeanDefinitionLoader {
void setResourceLoader(ResourceLoader resourceLoader) {
this.resourceLoader = resourceLoader;
this.scanner.setResourceLoader(resourceLoader);
if (this.xmlReader != null) {
this.xmlReader.setResourceLoader(resourceLoader);
}
this.xmlReader.setResourceLoader(resourceLoader);
}
/**
@@ -122,9 +118,7 @@ class BeanDefinitionLoader {
void setEnvironment(ConfigurableEnvironment environment) {
this.annotatedReader.setEnvironment(environment);
this.scanner.setEnvironment(environment);
if (this.xmlReader != null) {
this.xmlReader.setEnvironment(environment);
}
this.xmlReader.setEnvironment(environment);
}
/**
@@ -176,9 +170,6 @@ class BeanDefinitionLoader {
this.groovyReader.loadBeanDefinitions(source);
}
else {
if (this.xmlReader == null) {
throw new BeanDefinitionStoreException("Cannot load XML bean definitions when XML support is disabled");
}
this.xmlReader.loadBeanDefinitions(source);
}
}