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

Merge branch '1.2.x'

This commit is contained in:
Stephane Nicoll 2015-09-01 09:16:01 +02:00
parent fe1b2825ce 8a96481423
commit d46cf8e82e
1 changed files with 12 additions and 11 deletions
Show Stats 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

@ -226,21 +226,12 @@ public class SpringApplication {
if (sources != null && sources.length > 0) { if (sources != null && sources.length > 0) {
this.sources.addAll(Arrays.asList(sources)); this.sources.addAll(Arrays.asList(sources));
} }
this.webEnvironment = deduceWebEnvironment(); this.webEnvironment = isSpringWebAvailable();
setInitializers((Collection) getSpringFactoriesInstances(ApplicationContextInitializer.class)); setInitializers((Collection) getSpringFactoriesInstances(ApplicationContextInitializer.class));
setListeners((Collection) getSpringFactoriesInstances(ApplicationListener.class)); setListeners((Collection) getSpringFactoriesInstances(ApplicationListener.class));
this.mainApplicationClass = deduceMainApplicationClass(); this.mainApplicationClass = deduceMainApplicationClass();
} }
private boolean deduceWebEnvironment() {
for (String className : WEB_ENVIRONMENT_CLASSES) {
if (!ClassUtils.isPresent(className, null)) {
return false;
}
}
return true;
}
private Class<?> deduceMainApplicationClass() { private Class<?> deduceMainApplicationClass() {
try { try {
StackTraceElement[] stackTrace = new RuntimeException().getStackTrace(); StackTraceElement[] stackTrace = new RuntimeException().getStackTrace();
@ -886,7 +877,8 @@ public class SpringApplication {
public void setApplicationContextClass( public void setApplicationContextClass(
Class<? extends ConfigurableApplicationContext> applicationContextClass) { Class<? extends ConfigurableApplicationContext> applicationContextClass) {
this.applicationContextClass = applicationContextClass; this.applicationContextClass = applicationContextClass;
if (!WebApplicationContext.class.isAssignableFrom(applicationContextClass)) { if (isSpringWebAvailable() && !WebApplicationContext.class.isAssignableFrom(
applicationContextClass)) {
this.webEnvironment = false; this.webEnvironment = false;
} }
} }
@ -949,6 +941,15 @@ public class SpringApplication {
return asUnmodifiableOrderedSet(this.listeners); return asUnmodifiableOrderedSet(this.listeners);
} }
private boolean isSpringWebAvailable() {
for (String className : WEB_ENVIRONMENT_CLASSES) {
if (!ClassUtils.isPresent(className, null)) {
return false;
}
}
return true;
}
/** /**
* Static helper that can be used to run a {@link SpringApplication} from the * Static helper that can be used to run a {@link SpringApplication} from the
* specified source using default settings. * specified source using default settings.