From 7dd083ad69e64164c0f4084b4d374607b2c4e534 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Sat, 22 Oct 2022 18:08:18 +0900 Subject: [PATCH] Polish "Remove spring.xml.ignore flag usages" See gh-32846 --- .../boot/BeanDefinitionLoader.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java index fc4dc368c4b..62bdd48df49 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java @@ -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); } }