Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish contribution

Browse Source 
Closes gh-4753
This commit is contained in:
Stephane Nicoll
2015-12-14 18:13:24 +01:00
parent ad1ae8df91
commit e9dfb2292e
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@@ -145,16 +145,6 @@ import org.springframework.web.context.support.StandardServletEnvironment;
*/
public class SpringApplication {
/**
* The banner location property value used to load default banner.
*/
public static final String BANNER_LOCATION_PROPERTY_VALUE = "banner.txt";
/**
* The banner location property key.
*/
public static final String BANNER_LOCATION_PROPERTY = "banner.location";
/**
* The class name of application context that will be used by default for non-web
* environments.
@@ -172,6 +162,16 @@ public class SpringApplication {
private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet",
"org.springframework.web.context.ConfigurableWebApplicationContext" };
/**
* Default banner location.
*/
public static final String BANNER_LOCATION_PROPERTY_VALUE = "banner.txt";
/**
* Banner location property key.
*/
public static final String BANNER_LOCATION_PROPERTY = "banner.location";
private static final String CONFIGURABLE_WEB_ENVIRONMENT_CLASS = "org.springframework.web.context.ConfigurableWebEnvironment";
private static final String SYSTEM_PROPERTY_JAVA_AWT_HEADLESS = "java.awt.headless";
@@ -546,7 +546,8 @@ public class SpringApplication {
}
private Banner selectBanner(Environment environment) {
String location = environment.getProperty(BANNER_LOCATION_PROPERTY, BANNER_LOCATION_PROPERTY_VALUE);
String location = environment
.getProperty(BANNER_LOCATION_PROPERTY, BANNER_LOCATION_PROPERTY_VALUE);
ResourceLoader resourceLoader = this.resourceLoader != null ? this.resourceLoader
: new DefaultResourceLoader(getClassLoader());
Resource resource = resourceLoader.getResource(location);