root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #34764 from krzyk 

* gh-34764:
  Polish "Fix support for default values in banner placeholders"
  Fix support for default values in banner placeholders

Closes gh-34764
This commit is contained in:
Andy Wilkinson 2023-03-28 10:20:22 +01:00
parent 4705e82a6e 2d280bb967
commit a3135b49c3
2 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.
@ -19,7 +19,6 @@ package org.springframework.boot;
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.Log;
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,13 +45,14 @@ import org.springframework.util.StreamUtils;
* @author Phillip Webb
* @author Vedran Pavic
* @author Toshiaki Maki
* @author Krzysztof Krason
* @since 1.2.0
*/
public class ResourceBanner implements Banner {
private static final Log logger = LogFactory.getLog(ResourceBanner.class);
private Resource resource;
private final Resource resource;
public ResourceBanner(Resource resource) {
Assert.notNull(resource, "Resource must not be null");
@ -77,18 +78,18 @@ public class ResourceBanner implements Banner {
}
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 @@ public class ResourceBanner implements Banner {
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) {

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

@ -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 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
* @author Vedran Pavic
* @author Toshiaki Maki
* @author Krzysztof Krason
*/
class ResourceBannerTests {
@ -126,6 +127,15 @@ class ResourceBannerTests {
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);