From ea30c096dd2a1a8558a6978fbe78a1c268dd541f Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 25 Jun 2020 11:49:35 +0100 Subject: [PATCH] Polish 16263e3 See gh-22105 --- .../springframework/boot/BeanDefinitionLoader.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 3db8fbd201..9e29d1912b 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 @@ -159,18 +159,20 @@ class BeanDefinitionLoader { } } - private int load(Resource source) { + private void load(Resource source) { if (source.getFilename().endsWith(".groovy")) { if (this.groovyReader == null) { throw new BeanDefinitionStoreException("Cannot load Groovy beans without Groovy on classpath"); } - return this.groovyReader.loadBeanDefinitions(source); + this.groovyReader.loadBeanDefinitions(source); + } + else { + this.xmlReader.loadBeanDefinitions(source); } - return this.xmlReader.loadBeanDefinitions(source); } - private int load(Package source) { - return this.scanner.scan(source.getName()); + private void load(Package source) { + this.scanner.scan(source.getName()); } private void load(CharSequence source) {