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

Revert "Restore DataSourceProperties get...() methods" 

This reverts commit 037e697406.

See gh-6406
This commit is contained in:
Phillip Webb 2016-07-19 08:53:42 -07:00
parent 93ceb980bc
commit 1080b990e8
2 changed files with 20 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,14 +181,12 @@ public class DataSourceProperties
}
/**
* Determine the driver to use based on this configuration and the environment.
* @return the driver to use
* Return the configured driver or {@code null} if none was configured.
* @return the configured driver
* @see #determineDriverClassName()
* @deprecated as for 1.4 in favor of {@link #determineDriverClassName()}
*/
@Deprecated
public String getDriverClassName() {
return determineDriverClassName();
return this.driverClassName;
}
public void setDriverClassName(String driverClassName) {
@ -238,14 +236,12 @@ public class DataSourceProperties
}
/**
* Determine the url to use based on this configuration and the environment.
* @return the url to use
* Return the configured url or {@code null} if none was configured.
* @return the configured url
* @see #determineUrl()
* @deprecated as of 1.4 in favor of {@link #determineUrl()}
*/
@Deprecated
public String getUrl() {
return determineUrl();
return this.url;
}
public void setUrl(String url) {
@ -270,14 +266,12 @@ public class DataSourceProperties
}
/**
* Determine the username to use based on this configuration and the environment.
* @return the username to use
* Return the configured username or {@code null} if none was configured.
* @return the configured username
* @see #determineUsername()
* @deprecated as of 1.4 in favor of {@link #determineUsername()}
*/
@Deprecated
public String getUsername() {
return determineUsername();
return this.username;
}
public void setUsername(String username) {
@ -300,14 +294,12 @@ public class DataSourceProperties
}
/**
* Determine the password to use based on this configuration and the environment.
* @return the password to use
* Return the configured password or {@code null} if none was configured.
* @return the configured password
* @see #determinePassword()
* @deprecated as of 1.4 in favor of {@link #determinePassword()}
*/
@Deprecated
public String getPassword() {
return determinePassword();
return this.password;
}
public void setPassword(String password) {

76
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java
View File

@ -29,134 +29,74 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class DataSourcePropertiesTests {
@Test
@Deprecated
public void getDriver() {
DataSourceProperties properties = new DataSourceProperties();
properties.setUrl("jdbc:mysql://mydb");
assertThat(properties.getDriverClassName()).isEqualTo("com.mysql.jdbc.Driver");
}
@Test
public void determineDriver() {
DataSourceProperties properties = new DataSourceProperties();
properties.setUrl("jdbc:mysql://mydb");
assertThat(properties.getDriverClassName()).isNull();
assertThat(properties.determineDriverClassName())
.isEqualTo("com.mysql.jdbc.Driver");
}
@Test
@Deprecated
public void getDriverWithExplicitConfig() {
DataSourceProperties properties = new DataSourceProperties();
properties.setUrl("jdbc:mysql://mydb");
properties.setDriverClassName("org.hsqldb.jdbcDriver");
assertThat(properties.getDriverClassName()).isEqualTo("org.hsqldb.jdbcDriver");
}
@Test
public void determineDriverWithExplicitConfig() {
DataSourceProperties properties = new DataSourceProperties();
properties.setUrl("jdbc:mysql://mydb");
properties.setDriverClassName("org.hsqldb.jdbcDriver");
assertThat(properties.getDriverClassName()).isEqualTo("org.hsqldb.jdbcDriver");
assertThat(properties.determineDriverClassName())
.isEqualTo("org.hsqldb.jdbcDriver");
}
@Test
@Deprecated
public void getUrl() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.afterPropertiesSet();
assertThat(properties.getUrl()).isEqualTo(EmbeddedDatabaseConnection.H2.getUrl());
}
@Test
public void determineUrl() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.afterPropertiesSet();
assertThat(properties.getUrl()).isNull();
assertThat(properties.determineUrl())
.isEqualTo(EmbeddedDatabaseConnection.H2.getUrl());
}
@Test
@Deprecated
public void getUrlWithExplicitConfig() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.setUrl("jdbc:mysql://mydb");
properties.afterPropertiesSet();
assertThat(properties.getUrl()).isEqualTo("jdbc:mysql://mydb");
}
@Test
public void determineUrlWithExplicitConfig() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.setUrl("jdbc:mysql://mydb");
properties.afterPropertiesSet();
assertThat(properties.getUrl()).isEqualTo("jdbc:mysql://mydb");
assertThat(properties.determineUrl()).isEqualTo("jdbc:mysql://mydb");
}
@Test
@Deprecated
public void getUsername() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.afterPropertiesSet();
assertThat(properties.getUsername()).isEqualTo("sa");
}
@Test
public void determineUsername() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.afterPropertiesSet();
assertThat(properties.getUsername()).isNull();
assertThat(properties.determineUsername()).isEqualTo("sa");
}
@Test
@Deprecated
public void getUsernameWithExplicitConfig() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.setUsername("foo");
properties.afterPropertiesSet();
assertThat(properties.getUsername()).isEqualTo("foo");
}
@Test
public void determineUsernameWithExplicitConfig() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.setUsername("foo");
properties.afterPropertiesSet();
assertThat(properties.getUsername()).isEqualTo("foo");
assertThat(properties.determineUsername()).isEqualTo("foo");
}
@Test
@Deprecated
public void getPassword() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.afterPropertiesSet();
assertThat(properties.getPassword()).isEqualTo("");
}
@Test
public void determinePassword() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.afterPropertiesSet();
assertThat(properties.getPassword()).isNull();
assertThat(properties.determinePassword()).isEqualTo("");
}
@Test
@Deprecated
public void getPasswordWithExplicitConfig() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.setPassword("bar");
properties.afterPropertiesSet();
assertThat(properties.getPassword()).isEqualTo("bar");
}
@Test
public void determinePasswordWithExplicitConfig() throws Exception {
DataSourceProperties properties = new DataSourceProperties();
properties.setPassword("bar");
properties.afterPropertiesSet();
assertThat(properties.getPassword()).isEqualTo("bar");
assertThat(properties.determinePassword()).isEqualTo("bar");
}