From 1080b990e851d44b0339dfbfa6411678ba4a1905 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 19 Jul 2016 08:53:42 -0700 Subject: [PATCH] Revert "Restore DataSourceProperties get...() methods" This reverts commit 037e6974060612d24d6206f5c298f4314fb27fb8. See gh-6406 --- .../jdbc/DataSourceProperties.java | 32 +++----- .../jdbc/DataSourcePropertiesTests.java | 76 ++----------------- 2 files changed, 20 insertions(+), 88 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java index ee11619a43d..8f3419f9b3d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java @@ -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) { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java index 44427d1732d..294c13ac628 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourcePropertiesTests.java @@ -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"); }