Merge branch '2.7.x' into 3.0.x

Closes gh-34792

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import java.io.PrintStream;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -29,6 +28,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.boot.ansi.AnsiPropertySource;
+import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
@@ -45,6 +45,7 @@
  * @author Phillip Webb
  * @author Vedran Pavic
  * @author Toshiaki Maki
+ * @author Krzysztof Krason
  * @since 1.2.0
  */
 public class ResourceBanner implements Banner {
@@ -77,18 +78,18 @@ public void printBanner(Environment environment, Class<?> sourceClass, PrintStre
 	}
 
 	protected List<PropertyResolver> getPropertyResolvers(Environment environment, Class<?> sourceClass) {
-		List<PropertyResolver> resolvers = new ArrayList<>();
-		resolvers.add(environment);
-		resolvers.add(getVersionResolver(sourceClass));
-		resolvers.add(getAnsiResolver());
-		resolvers.add(getTitleResolver(sourceClass));
-		return resolvers;
+		MutablePropertySources propertySources = new MutablePropertySources();
+		if (environment instanceof ConfigurableEnvironment) {
+			((ConfigurableEnvironment) environment).getPropertySources().forEach(propertySources::addLast);
+		}
+		propertySources.addLast(getTitleSource(sourceClass));
+		propertySources.addLast(getAnsiSource());
+		propertySources.addLast(getVersionSource(sourceClass));
+		return Collections.singletonList(new PropertySourcesPropertyResolver(propertySources));
 	}
 
-	private PropertyResolver getVersionResolver(Class<?> sourceClass) {
-		MutablePropertySources propertySources = new MutablePropertySources();
-		propertySources.addLast(new MapPropertySource("version", getVersionsMap(sourceClass)));
-		return new PropertySourcesPropertyResolver(propertySources);
+	private MapPropertySource getVersionSource(Class<?> sourceClass) {
+		return new MapPropertySource("version", getVersionsMap(sourceClass));
 	}
 
 	private Map<String, Object> getVersionsMap(Class<?> sourceClass) {
@@ -118,19 +119,15 @@ private String getVersionString(String version, boolean format) {
 		return format ? " (v" + version + ")" : version;
 	}
 
-	private PropertyResolver getAnsiResolver() {
-		MutablePropertySources sources = new MutablePropertySources();
-		sources.addFirst(new AnsiPropertySource("ansi", true));
-		return new PropertySourcesPropertyResolver(sources);
+	private AnsiPropertySource getAnsiSource() {
+		return new AnsiPropertySource("ansi", true);
 	}
 
-	private PropertyResolver getTitleResolver(Class<?> sourceClass) {
-		MutablePropertySources sources = new MutablePropertySources();
+	private MapPropertySource getTitleSource(Class<?> sourceClass) {
 		String applicationTitle = getApplicationTitle(sourceClass);
 		Map<String, Object> titleMap = Collections.singletonMap("application.title",
 				(applicationTitle != null) ? applicationTitle : "");
-		sources.addFirst(new MapPropertySource("title", titleMap));
-		return new PropertySourcesPropertyResolver(sources);
+		return new MapPropertySource("title", titleMap);
 	}
 
 	protected String getApplicationTitle(Class<?> sourceClass) {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/ResourceBannerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
  * @author Phillip Webb
  * @author Vedran Pavic
  * @author Toshiaki Maki
+ * @author Krzysztof Krason
  */
 class ResourceBannerTests {
 
@@ -126,6 +127,15 @@ void renderWithoutTitle() {
 		assertThat(banner).startsWith("banner  1");
 	}
 
+	@Test
+	void renderWithDefaultValues() {
+		Resource resource = new ByteArrayResource(
+				"banner ${a:default-a} ${b:default-b} ${spring-boot.version:default-boot-version} ${application.version:default-application-version}"
+					.getBytes());
+		String banner = printBanner(resource, "10.2", "1.0", null);
+		assertThat(banner).startsWith("banner 1 default-b 10.2 1.0");
+	}
+
 	private String printBanner(Resource resource, String bootVersion, String applicationVersion,
 			String applicationTitle) {
 		ResourceBanner banner = new MockResourceBanner(resource, bootVersion, applicationVersion, applicationTitle);