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

Standardize on spring.datasource.* for database config 

[Fixes #58921238] [bs-333] spring.database.* and
spring.datasource.* used to configure database
This commit is contained in:
Dave Syer 2013-10-15 16:39:59 -04:00
parent ea11dafcbd
commit acf458b462
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceConfiguration.java
View File

@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
* *
* @author Dave Syer * @author Dave Syer
*/ */
@ConfigurationProperties(name = "spring.datasource") @ConfigurationProperties(name = DataSourceAutoConfiguration.CONFIGURATION_PREFIX)
@EnableConfigurationProperties @EnableConfigurationProperties
public abstract class AbstractDataSourceConfiguration implements BeanClassLoaderAware { public abstract class AbstractDataSourceConfiguration implements BeanClassLoaderAware {

9
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
View File

@ -69,6 +69,8 @@ public class DataSourceAutoConfiguration implements EnvironmentAware {
private static Log logger = LogFactory.getLog(DataSourceAutoConfiguration.class); private static Log logger = LogFactory.getLog(DataSourceAutoConfiguration.class);
public static final String CONFIGURATION_PREFIX = "spring.datasource";
@Autowired(required = false) @Autowired(required = false)
private DataSource dataSource; private DataSource dataSource;
@ -79,7 +81,8 @@ public class DataSourceAutoConfiguration implements EnvironmentAware {
@Override @Override
public void setEnvironment(Environment environment) { public void setEnvironment(Environment environment) {
this.environment = new RelaxedPropertyResolver(environment, "spring.database."); this.environment = new RelaxedPropertyResolver(environment, CONFIGURATION_PREFIX
+ ".");
} }
@PostConstruct @PostConstruct
@ -218,7 +221,7 @@ public class DataSourceAutoConfiguration implements EnvironmentAware {
private String getDriverClassName(Environment environment, ClassLoader classLoader) { private String getDriverClassName(Environment environment, ClassLoader classLoader) {
String driverClassName = environment == null ? null : environment String driverClassName = environment == null ? null : environment
.getProperty("spring.database.driverClassName"); .getProperty(CONFIGURATION_PREFIX + ".driverClassName");
if (driverClassName == null) { if (driverClassName == null) {
driverClassName = EmbeddedDatabaseConnection.get(classLoader) driverClassName = EmbeddedDatabaseConnection.get(classLoader)
.getDriverClassName(); .getDriverClassName();
@ -228,7 +231,7 @@ public class DataSourceAutoConfiguration implements EnvironmentAware {
private String getUrl(Environment environment, ClassLoader classLoader) { private String getUrl(Environment environment, ClassLoader classLoader) {
String url = (environment == null ? null : environment String url = (environment == null ? null : environment
.getProperty("spring.database.url")); .getProperty(CONFIGURATION_PREFIX + ".url"));
if (url == null) { if (url == null) {
url = EmbeddedDatabaseConnection.get(classLoader).getUrl(); url = EmbeddedDatabaseConnection.get(classLoader).getUrl();
} }

4
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java
View File

@ -101,7 +101,7 @@ public class DataSourceAutoConfigurationTests {
this.context.register(DataSourceAutoConfiguration.class, this.context.register(DataSourceAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class); PropertyPlaceholderAutoConfiguration.class);
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("spring.database.schema", map.put(DataSourceAutoConfiguration.CONFIGURATION_PREFIX + ".schema",
ClassUtils.addResourcePathToPackagePath(getClass(), "schema.sql")); ClassUtils.addResourcePathToPackagePath(getClass(), "schema.sql"));
this.context.getEnvironment().getPropertySources() this.context.getEnvironment().getPropertySources()
.addFirst(new MapPropertySource("test", map)); .addFirst(new MapPropertySource("test", map));
@ -119,7 +119,7 @@ public class DataSourceAutoConfigurationTests {
this.context.register(DataSourceAutoConfiguration.class, this.context.register(DataSourceAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class); PropertyPlaceholderAutoConfiguration.class);
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("spring.database.schema", map.put(DataSourceAutoConfiguration.CONFIGURATION_PREFIX + ".schema",
ClassUtils.addResourcePathToPackagePath(getClass(), "schema.sql") ClassUtils.addResourcePathToPackagePath(getClass(), "schema.sql")
+ "," + ","
+ ClassUtils.addResourcePathToPackagePath(getClass(), + ClassUtils.addResourcePathToPackagePath(getClass(),