diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java index 9509046174..638634cbed 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataAbstractSource.java @@ -329,7 +329,7 @@ public abstract class DruidDataAbstractSource implements DataSource, DataSourceP this.jdbcUrl = jdbcUrl; } - public String getDriverClass() { + public String getDriverClassName() { return driverClass; } diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java index 616c5fa088..8b711b2fb9 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceMBean.java @@ -21,7 +21,7 @@ public interface DruidDataSourceMBean { String getUrl(); - String getDriverClass(); + String getDriverClassName(); long getConnectCount(); diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case0.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case0.java index 9f9833b9f2..30cfddcdd2 100644 --- a/src/test/java/com/alibaba/druid/pool/benckmark/Case0.java +++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case0.java @@ -44,6 +44,8 @@ public class Case0 extends TestCase { dataSource.setPoolPreparedStatements(true); dataSource.setUsername(user); dataSource.setPassword(password); + dataSource.setValidationQuery("SELECT 1"); + dataSource.setTestOnBorrow(true); for (int i = 0; i < 10; ++i) { p0(dataSource, "druid"); @@ -64,6 +66,8 @@ public class Case0 extends TestCase { dataSource.setPoolPreparedStatements(true); dataSource.setUsername(user); dataSource.setPassword(password); + dataSource.setValidationQuery("SELECT 1"); + dataSource.setTestOnBorrow(true); for (int i = 0; i < 10; ++i) { p0(dataSource, "dbcp"); diff --git a/src/test/java/com/alibaba/druid/pool/demo/Demo0.java b/src/test/java/com/alibaba/druid/pool/demo/Demo0.java new file mode 100644 index 0000000000..ac8999a94d --- /dev/null +++ b/src/test/java/com/alibaba/druid/pool/demo/Demo0.java @@ -0,0 +1,50 @@ +package com.alibaba.druid.pool.demo; + +import java.sql.Connection; + +import junit.framework.TestCase; + +import com.alibaba.druid.pool.DruidDataSource; +import com.alibaba.druid.util.JMXUtils; + +public class Demo0 extends TestCase { + private String jdbcUrl; + private String user; + private String password; + private String driverClass; + private int initialSize = 10; + private int minPoolSize = 1; + private int maxPoolSize = 2; + private int maxActive = 2; + + protected void setUp() throws Exception { + jdbcUrl = "jdbc:fake:dragoon_v25masterdb"; + user = "dragoon25"; + password = "dragoon25"; + driverClass = "com.alibaba.druid.mock.MockDriver"; + } + + public void test_0() throws Exception { + DruidDataSource dataSource = new DruidDataSource(); + + JMXUtils.register("com.alibaba:type=DruidDataSource", dataSource); + + dataSource.setInitialSize(initialSize); + dataSource.setMaxActive(maxActive); + dataSource.setMinIdle(minPoolSize); + dataSource.setMaxIdle(maxPoolSize); + dataSource.setPoolPreparedStatements(true); + dataSource.setDriverClassName(driverClass); + dataSource.setUrl(jdbcUrl); + dataSource.setPoolPreparedStatements(true); + dataSource.setUsername(user); + dataSource.setPassword(password); + dataSource.setValidationQuery("SELECT 1"); + dataSource.setTestOnBorrow(true); + + Connection conn = dataSource.getConnection(); + conn.close(); + + System.out.println(); + } +}