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

Merge pull request #336 from jkubrynski/master

Browse Source 
* pull336:
  Now custom SpringApplication class can be used when extending SpringApplicationContextLoader
This commit is contained in:
Dave Syer
2014-02-11 15:09:10 +00:00
parent 76c56c6aa9 6f2e133a0a
commit 2f138d84dd
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
View File

@@ -58,7 +58,7 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
public ApplicationContext loadContext(MergedContextConfiguration mergedConfig)
throws Exception {
SpringApplication application = new SpringApplication();
SpringApplication application = getSpringApplication();
application.setSources(getSources(mergedConfig));
if (!ObjectUtils.isEmpty(mergedConfig.getActiveProfiles())) {
application.setAdditionalProfiles(mergedConfig.getActiveProfiles());
@@ -77,6 +77,15 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
return application.run();
}
/**
* Builds new {@link org.springframework.boot.SpringApplication} instance. You can override
* this method to add custom behaviour
* @return {@link org.springframework.boot.SpringApplication} instance
*/
protected SpringApplication getSpringApplication() {
return new SpringApplication();
}
private Set<Object> getSources(MergedContextConfiguration mergedConfig) {
Set<Object> sources = new LinkedHashSet<Object>();
sources.addAll(Arrays.asList(mergedConfig.getClasses()));