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

Relocate configuration prefix constant 

Relocate DataSourceAutoConfiguration.CONFIGURATION_PREFIX to
DataSourceProperties.PREFIX.
This commit is contained in:
Phillip Webb 2014-08-21 21:43:10 -07:00
parent 3512f56c0a
commit 77bf558307
5 changed files with 8 additions and 8 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/DataSourceAutoConfiguration.java
View File

@ -56,8 +56,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
@Import(Registrar.class) @Import(Registrar.class)
public class DataSourceAutoConfiguration { public class DataSourceAutoConfiguration {
public static final String CONFIGURATION_PREFIX = "spring.datasource";
/** /**
* Determines if the {@code dataSource} being used by Spring was created from * Determines if the {@code dataSource} being used by Spring was created from
* {@link EmbeddedDataSourceConfiguration}. * {@link EmbeddedDataSourceConfiguration}.
@ -99,7 +97,7 @@ public class DataSourceAutoConfiguration {
@Autowired @Autowired
private DataSourceProperties properties; private DataSourceProperties properties;
@ConfigurationProperties(prefix = DataSourceAutoConfiguration.CONFIGURATION_PREFIX) @ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
@Bean @Bean
public DataSource dataSource() { public DataSource dataSource() {
DataSourceBuilder factory = DataSourceBuilder DataSourceBuilder factory = DataSourceBuilder

6
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
View File

@ -31,9 +31,11 @@ import org.springframework.util.StringUtils;
* @author Maciej Walkowiak * @author Maciej Walkowiak
* @since 1.1.0 * @since 1.1.0
*/ */
@ConfigurationProperties(prefix = DataSourceAutoConfiguration.CONFIGURATION_PREFIX) @ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
public class DataSourceProperties implements BeanClassLoaderAware, InitializingBean { public class DataSourceProperties implements BeanClassLoaderAware, InitializingBean {
public static final String PREFIX = "spring.datasource";
private String driverClassName; private String driverClassName;
private String url; private String url;
@ -199,7 +201,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
} }
public String getSqlScriptEncoding() { public String getSqlScriptEncoding() {
return sqlScriptEncoding; return this.sqlScriptEncoding;
} }
public void setSqlScriptEncoding(String sqlScriptEncoding) { public void setSqlScriptEncoding(String sqlScriptEncoding) {

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDataSourceConfigurationTests.java
View File

@ -92,7 +92,7 @@ public class CommonsDataSourceConfigurationTests {
protected static class CommonsDataSourceConfiguration { protected static class CommonsDataSourceConfiguration {
@Bean @Bean
@ConfigurationProperties(prefix = DataSourceAutoConfiguration.CONFIGURATION_PREFIX) @ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
public DataSource dataSource() { public DataSource dataSource() {
return DataSourceBuilder.create().type(BasicDataSource.class).build(); return DataSourceBuilder.create().type(BasicDataSource.class).build();
} }

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java
View File

@ -103,7 +103,7 @@ public class HikariDataSourceConfigurationTests {
protected static class HikariDataSourceConfiguration { protected static class HikariDataSourceConfiguration {
@Bean @Bean
@ConfigurationProperties(prefix = DataSourceAutoConfiguration.CONFIGURATION_PREFIX) @ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
public DataSource dataSource() { public DataSource dataSource() {
return DataSourceBuilder.create().type(HikariDataSource.class).build(); return DataSourceBuilder.create().type(HikariDataSource.class).build();
} }

2
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java
View File

@ -135,7 +135,7 @@ public class TomcatDataSourceConfigurationTests {
protected static class TomcatDataSourceConfiguration { protected static class TomcatDataSourceConfiguration {
@Bean @Bean
@ConfigurationProperties(prefix = DataSourceAutoConfiguration.CONFIGURATION_PREFIX) @ConfigurationProperties(prefix = DataSourceProperties.PREFIX)
public DataSource dataSource() { public DataSource dataSource() {
return DataSourceBuilder.create() return DataSourceBuilder.create()
.type(org.apache.tomcat.jdbc.pool.DataSource.class).build(); .type(org.apache.tomcat.jdbc.pool.DataSource.class).build();