This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new fced9384 Add DataSourceMXBean.getUserName() and deprecate getUsername()
fced9384 is described below
commit fced9384f3936bb4d5504f29ca7211be1ad951ce
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Oct 23 11:35:15 2023 -0400
Add DataSourceMXBean.getUserName() and deprecate getUsername()
---
pom.xml | 4 ++--
src/changes/changes.xml | 3 ++-
src/main/java/org/apache/commons/dbcp2/BasicDataSource.java | 2 ++
.../org/apache/commons/dbcp2/ConnectionFactoryFactory.java | 2 +-
src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java | 12 ++++++++++++
.../apache/commons/dbcp2/managed/BasicManagedDataSource.java | 2 +-
.../org/apache/commons/dbcp2/TestBasicDataSourceFactory.java | 1 +
7 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 73e11a9d..12c5ca81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-dbcp2</artifactId>
- <version>2.10.1-SNAPSHOT</version>
+ <version>2.11.0-SNAPSHOT</version>
<name>Apache Commons DBCP</name>
<inceptionYear>2001</inceptionYear>
@@ -303,7 +303,7 @@
<commons.rc.version>RC1</commons.rc.version>
<commons.module.name>org.apache.commons.dbcp2</commons.module.name>
- <commons.release.version>2.10.0</commons.release.version>
+ <commons.release.version>2.11.0</commons.release.version>
<commons.release.desc>for JDBC 4.2 on Java 8</commons.release.desc>
<commons.release.hash>sha512</commons.release.hash>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 49065ffc..04fdc089 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -62,9 +62,10 @@ The <action> type attribute can be add,update,fix,remove.
EvictionTimer
-->
<body>
- <release version="2.10.1" date="20YY-MM-DD" description="This is a minor
release, including bug fixes and enhancements.">
+ <release version="2.11.0" date="20YY-MM-DD" description="This is a minor
release, including bug fixes and enhancements.">
<!-- FIX -->
<!-- ADD -->
+ <action type="update" dev="ggregory" due-to="Gary Gregory,
Dependabot">Add DataSourceMXBean.getUserName() and deprecate
getUsername().</action>
<!-- UDPATE -->
<action type="update" dev="ggregory" due-to="Gary Gregory,
Dependabot">Bump h2 from 2.2.220 to 2.2.224, #308.</action>
<action type="update" dev="ggregory" due-to="Gary Gregory">Bump
commons-parent from 60 to 64.</action>
diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
index e308e86e..d3b1799c 100644
--- a/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
@@ -1440,7 +1440,9 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
* Gets the JDBC connection {code userName} property.
*
* @return the {code userName} passed to the JDBC driver to establish
connections
+ * @deprecated
*/
+ @Deprecated
@Override
public String getUsername() {
return this.userName;
diff --git
a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
index ba17862b..23ce4e4b 100644
--- a/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/ConnectionFactoryFactory.java
@@ -42,7 +42,7 @@ final class ConnectionFactoryFactory {
final Properties connectionProperties =
basicDataSource.getConnectionProperties();
final String url = basicDataSource.getUrl();
// Set up the driver connection factory we will use
- final String user = basicDataSource.getUsername();
+ final String user = basicDataSource.getUserName();
if (user != null) {
connectionProperties.put(Constants.KEY_USER, user);
} else {
diff --git a/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
b/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
index 56fb5c88..d3208c20 100644
--- a/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
+++ b/src/main/java/org/apache/commons/dbcp2/DataSourceMXBean.java
@@ -274,9 +274,21 @@ public interface DataSourceMXBean {
* See {@link BasicDataSource#getUsername()}.
*
* @return {@link BasicDataSource#getUsername()}.
+ * @deprecated Use {@link #getUserName()}.
*/
+ @Deprecated
String getUsername();
+ /**
+ * See {@link BasicDataSource#getUsername()}.
+ *
+ * @return {@link BasicDataSource#getUsername()}.
+ * @since 2.11.0
+ */
+ default String getUserName() {
+ return getUsername();
+ }
+
/**
* See {@link BasicDataSource#getValidationQuery()}.
*
diff --git
a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
index b2a56323..91e644c2 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
@@ -102,7 +102,7 @@ public class BasicManagedDataSource extends BasicDataSource
{
// finally, create the XAConnectionFactory using the XA data source
final XAConnectionFactory xaConnectionFactory = new
DataSourceXAConnectionFactory(getTransactionManager(),
- xaDataSourceInstance, getUsername(),
Utils.toCharArray(getPassword()), getTransactionSynchronizationRegistry());
+ xaDataSourceInstance, getUserName(),
Utils.toCharArray(getPassword()), getTransactionSynchronizationRegistry());
transactionRegistry = xaConnectionFactory.getTransactionRegistry();
return xaConnectionFactory;
}
diff --git
a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
index 52463820..f513cab2 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
@@ -78,6 +78,7 @@ public class TestBasicDataSourceFactory {
assertTrue(ds.getTestOnBorrow());
assertFalse(ds.getTestOnReturn());
assertEquals("userName", ds.getUsername());
+ assertEquals("userName", ds.getUserName());
assertEquals("password", ds.getPassword());
assertEquals("SELECT DUMMY FROM DUAL", ds.getValidationQuery());
assertEquals(Duration.ofSeconds(100),
ds.getValidationQueryTimeoutDuration());
