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

Rename a few `setup` methods to `configure` 

Fixes gh-537
This commit is contained in:
Phillip Webb 2014-03-21 11:25:31 -07:00
parent 701bb6ee0a
commit 03667c7ddc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CommonsDataSourceConfiguration.java
View File

@ -51,11 +51,11 @@ public class CommonsDataSourceConfiguration extends AbstractDataSourceConfigurat
public DataSource dataSource() {
logger.info("Hint: using Commons DBCP BasicDataSource. It's going to work, "
+ "but the Tomcat DataSource is more reliable.");
this.pool = createAndSetupPool();
this.pool = createAndConfigurePool();
return this.pool;
}
private BasicDataSource createAndSetupPool() {
private BasicDataSource createAndConfigurePool() {
BasicDataSource pool = new BasicDataSource();
pool.setDriverClassName(getDriverClassName());
pool.setUrl(getUrl());

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

@ -77,7 +77,7 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
List<ApplicationContextInitializer<?>> initializers = getInitializers(
mergedConfig, application);
if (mergedConfig instanceof WebMergedContextConfiguration) {
new WebConfigurer().setup(mergedConfig, application, initializers);
new WebConfigurer().configure(mergedConfig, application, initializers);
}
else {
application.setWebEnvironment(false);
@ -168,20 +168,22 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
}
private static class WebConfigurer {
void setup(MergedContextConfiguration mergedConfig,
void configure(MergedContextConfiguration configuration,
SpringApplication application,
List<ApplicationContextInitializer<?>> initializers) {
WebMergedContextConfiguration webConfig = (WebMergedContextConfiguration) mergedConfig;
if (AnnotationUtils.findAnnotation(webConfig.getTestClass(),
WebMergedContextConfiguration webConfiguration = (WebMergedContextConfiguration) configuration;
if (AnnotationUtils.findAnnotation(webConfiguration.getTestClass(),
IntegrationTest.class) == null) {
MockServletContext servletContext = new MockServletContext(
webConfig.getResourceBasePath());
webConfiguration.getResourceBasePath());
initializers.add(0, new ServletContextApplicationContextInitializer(
servletContext));
application
.setApplicationContextClass(GenericWebApplicationContext.class);
}
}
}
}