GH-1069 Ensure 'spring.main.banner-mode' is honored by ServerlessWebA…

…pplication Resolves #1069
spring-cloud · Sep 25, 2023 · 1b0a5e3 · 1b0a5e3
1 parent 42336c8
commit 1b0a5e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/...main/java/org/springframework/cloud/function/serverless/web/ServerlessWebApplication.java b/...main/java/org/springframework/cloud/function/serverless/web/ServerlessWebApplication.java
@@ -155,6 +155,13 @@ private SpringApplicationRunListeners getRunListeners(String[] args) {
 	private Banner printBanner(ConfigurableEnvironment environment) {
 		ResourceLoader resourceLoader = (this.getResourceLoader() != null) ? this.getResourceLoader()
 				: new DefaultResourceLoader(null);
+		Banner.Mode  bannerMode = environment.containsProperty("spring.main.banner-mode")
+				? Banner.Mode.valueOf(environment.getProperty("spring.main.banner-mode").trim().toUpperCase())
+						: Banner.Mode.CONSOLE;
+
+		if (bannerMode == Banner.Mode.OFF) {
+			return null;
+		}
 		SpringApplicationBannerPrinter bannerPrinter = new SpringApplicationBannerPrinter(resourceLoader, new SpringAwsBanner());
 		return bannerPrinter.print(environment, this.getMainApplicationClass(), System.out);
 	}

diff --git a/...src/test/java/org/springframework/cloud/function/serverless/web/RequestResponseTests.java b/...src/test/java/org/springframework/cloud/function/serverless/web/RequestResponseTests.java
@@ -46,6 +46,7 @@ public class RequestResponseTests {
 
 	@BeforeEach
 	public void before() {
+		System.setProperty("spring.main.banner-mode", "off");
 		this.mvc = ProxyMvc.INSTANCE(ProxyErrorController.class, PetStoreSpringAppConfig.class);
 	}
 
@@ -136,6 +137,7 @@ public void validatePostWithBody() throws Exception {
 
 	@Test
 	public void validatePostAsyncWithBody() throws Exception {
+//		System.setProperty("spring.main.banner-mode", "off");
 		ProxyHttpServletRequest request = new ProxyHttpServletRequest(null, "POST", "/petsAsync/");
 		String jsonPet = "{\n"
 				+ "   \"id\":\"1234\",\n"