Restore spring.main.disable_banner=fase support

Fixes spring-projectsgh-1918
snakezzl · Nov 13, 2014 · 4840d2c · 4840d2c
1 parent 90d25bd
commit 4840d2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -282,12 +282,12 @@ public ConfigurableApplicationContext run(String... args) {
 			// Create and configure the environment
 			ConfigurableEnvironment environment = getOrCreateEnvironment();
 			configureEnvironment(environment, args);
-			if (this.showBanner) {
-				printBanner(environment);
-			}
 			for (SpringApplicationRunListener runListener : runListeners) {
 				runListener.environmentPrepared(environment);
 			}
+			if (this.showBanner) {
+				printBanner(environment);
+			}
 
 			// Create, load, refresh and run the ApplicationContext
 			context = createApplicationContext();

diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -156,6 +156,14 @@ public void disableBanner() throws Exception {
 		verify(application, never()).printBanner((Environment) anyObject());
 	}
 
+	@Test
+	public void disableBannerViaProperty() throws Exception {
+		SpringApplication application = spy(new SpringApplication(ExampleConfig.class));
+		application.setWebEnvironment(false);
+		application.run("--spring.main.show_banner=false");
+		verify(application, never()).printBanner((Environment) anyObject());
+	}
+
 	@Test
 	@SuppressWarnings("deprecation")
 	public void customBanner() throws Exception {