Repository: commons-dbcp Updated Branches: refs/heads/master 10636cf7f -> 3187c92b9
Javadoc and organize. Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/3187c92b Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/3187c92b Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/3187c92b Branch: refs/heads/master Commit: 3187c92b9b39a2f0663f42d2ec2e1ffa8c45db10 Parents: 10636cf Author: Gary Gregory <[email protected]> Authored: Sun Jun 10 10:21:46 2018 -0600 Committer: Gary Gregory <[email protected]> Committed: Sun Jun 10 10:21:46 2018 -0600 ---------------------------------------------------------------------- .../dbcp2/DataSourceConnectionFactory.java | 47 +++++++++++++------- 1 file changed, 32 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/3187c92b/src/main/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java index 0407f43..f7bb5f8 100644 --- a/src/main/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/DataSourceConnectionFactory.java @@ -27,25 +27,42 @@ import javax.sql.DataSource; * @since 2.0 */ public class DataSourceConnectionFactory implements ConnectionFactory { - public DataSourceConnectionFactory(final DataSource source) { - this(source,null,null); - } - public DataSourceConnectionFactory(final DataSource source, final String uname, final String passwd) { - _source = source; - _uname = uname; - _passwd = passwd; - } + private final DataSource dataSource; + + private final String userName; + + private final String userPassword; + /** + * Constructs an instance for the given DataSource. + * + * @param dataSource + * The DataSource for this factory. + */ + public DataSourceConnectionFactory(final DataSource dataSource) { + this(dataSource, null, null); + } + /** + * Constructs an instance for the given DataSource. + * + * @param dataSource + * The DataSource for this factory. + * @param userName + * The user name. + * @param password + * The user password. + */ + public DataSourceConnectionFactory(final DataSource dataSource, final String userName, final String password) { + this.dataSource = dataSource; + this.userName = userName; + this.userPassword = password; + } @Override public Connection createConnection() throws SQLException { - if(null == _uname && null == _passwd) { - return _source.getConnection(); + if (null == userName && null == userPassword) { + return dataSource.getConnection(); } - return _source.getConnection(_uname,_passwd); + return dataSource.getConnection(userName, userPassword); } - - private final String _uname; - private final String _passwd; - private final DataSource _source; }
