diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 8848afb0817..366273cd09e 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -155,8 +155,6 @@ public class SpringApplication { private Set sources = new LinkedHashSet(); - private Set initialSources = new LinkedHashSet(); - private Class mainApplicationClass; private boolean showBanner = true; @@ -211,7 +209,7 @@ public class SpringApplication { private void initialize(Object[] sources) { if (sources != null && sources.length > 0) { - this.initialSources.addAll(Arrays.asList(sources)); + this.sources.addAll(Arrays.asList(sources)); } this.webEnvironment = deduceWebEnvironment(); this.initializers = new LinkedHashSet>(); @@ -301,7 +299,7 @@ public class SpringApplication { // Call all remaining initializers callEnvironmentAwareSpringApplicationInitializers(args, environment); - Set sources = assembleSources(); + Set sources = getSources(); Assert.notEmpty(sources, "Sources must not be empty"); if (this.showBanner) { printBanner(); @@ -366,13 +364,6 @@ public class SpringApplication { } } - private Set assembleSources() { - LinkedHashSet sources = new LinkedHashSet(); - sources.addAll(this.sources); - sources.addAll(this.initialSources); - return sources; - } - private void callNonEnvironmentAwareSpringApplicationInitializers(String[] args) { for (ApplicationContextInitializer initializer : getInitializers()) { if (initializer instanceof SpringApplicationInitializer @@ -727,7 +718,7 @@ public class SpringApplication { */ public void setSources(Set sources) { Assert.notNull(sources, "Sources must not be null"); - this.sources = new LinkedHashSet(sources); + this.sources.addAll(sources); } /** diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java index e2d8f57f8a0..0805c09138e 100644 --- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java @@ -52,7 +52,6 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.env.StandardEnvironment; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; -import org.springframework.test.util.ReflectionTestUtils; import org.springframework.util.StringUtils; import static org.hamcrest.Matchers.equalTo; @@ -322,9 +321,7 @@ public class SpringApplicationTests { application.setWebEnvironment(false); application.setUseMockLoader(true); application.run(); - @SuppressWarnings("unchecked") - Set initialSources = (Set) ReflectionTestUtils.getField( - application, "initialSources"); + Set initialSources = application.getSources(); assertThat(initialSources.toArray(), equalTo(sources)); }