Repository: commons-dbcp Updated Branches: refs/heads/master db4130171 -> 6c97f898c
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6c97f898/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java index 3871b56..dfaab5e 100644 --- a/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java @@ -59,54 +59,54 @@ public class BasicDataSourceFactory implements ObjectFactory { private static final Log log = LogFactory.getLog(BasicDataSourceFactory.class); - private static final String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit"; - private static final String PROP_DEFAULTREADONLY = "defaultReadOnly"; - private static final String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation"; - private static final String PROP_DEFAULTCATALOG = "defaultCatalog"; - private static final String PROP_DEFAULTSCHEMA = "defaultSchema"; - private static final String PROP_CACHESTATE = "cacheState"; - private static final String PROP_DRIVERCLASSNAME = "driverClassName"; + private static final String PROP_DEFAULT_AUTO_COMMIT = "defaultAutoCommit"; + private static final String PROP_DEFAULT_READ_ONLY = "defaultReadOnly"; + private static final String PROP_DEFAULT_TRANSACTION_ISOLATION = "defaultTransactionIsolation"; + private static final String PROP_DEFAULT_CATALOG = "defaultCatalog"; + private static final String PROP_DEFAULT_SCHEMA = "defaultSchema"; + private static final String PROP_CACHE_STATE = "cacheState"; + private static final String PROP_DRIVER_CLASS_NAME = "driverClassName"; private static final String PROP_LIFO = "lifo"; - private static final String PROP_MAXTOTAL = "maxTotal"; - private static final String PROP_MAXIDLE = "maxIdle"; - private static final String PROP_MINIDLE = "minIdle"; - private static final String PROP_INITIALSIZE = "initialSize"; - private static final String PROP_MAXWAITMILLIS = "maxWaitMillis"; - private static final String PROP_TESTONCREATE = "testOnCreate"; - private static final String PROP_TESTONBORROW = "testOnBorrow"; - private static final String PROP_TESTONRETURN = "testOnReturn"; - private static final String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis"; - private static final String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun"; - private static final String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis"; - private static final String PROP_SOFTMINEVICTABLEIDLETIMEMILLIS = "softMinEvictableIdleTimeMillis"; - private static final String PROP_EVICTIONPOLICYCLASSNAME = "evictionPolicyClassName"; - private static final String PROP_TESTWHILEIDLE = "testWhileIdle"; + private static final String PROP_MAX_TOTAL = "maxTotal"; + private static final String PROP_MAX_IDLE = "maxIdle"; + private static final String PROP_MIN_IDLE = "minIdle"; + private static final String PROP_INITIAL_SIZE = "initialSize"; + private static final String PROP_MAX_WAIT_MILLIS = "maxWaitMillis"; + private static final String PROP_TEST_ON_CREATE = "testOnCreate"; + private static final String PROP_TEST_ON_BORROW = "testOnBorrow"; + private static final String PROP_TEST_ON_RETURN = "testOnReturn"; + private static final String PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS = "timeBetweenEvictionRunsMillis"; + private static final String PROP_NUM_TESTS_PER_EVICTION_RUN = "numTestsPerEvictionRun"; + private static final String PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS = "minEvictableIdleTimeMillis"; + private static final String PROP_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS = "softMinEvictableIdleTimeMillis"; + private static final String PROP_EVICTION_POLICY_CLASS_NAME = "evictionPolicyClassName"; + private static final String PROP_TEST_WHILE_IDLE = "testWhileIdle"; private static final String PROP_PASSWORD = "password"; private static final String PROP_URL = "url"; - private static final String PROP_USERNAME = "username"; - private static final String PROP_VALIDATIONQUERY = "validationQuery"; - private static final String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout"; + private static final String PROP_USER_NAME = "username"; + private static final String PROP_VALIDATION_QUERY = "validationQuery"; + private static final String PROP_VALIDATION_QUERY_TIMEOUT = "validationQueryTimeout"; private static final String PROP_JMX_NAME = "jmxName"; /** * The property name for connectionInitSqls. The associated value String must be of the form [query;]* */ - private static final String PROP_CONNECTIONINITSQLS = "connectionInitSqls"; - private static final String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed"; - private static final String PROP_REMOVEABANDONEDONBORROW = "removeAbandonedOnBorrow"; - private static final String PROP_REMOVEABANDONEDONMAINTENANCE = "removeAbandonedOnMaintenance"; - private static final String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout"; - private static final String PROP_LOGABANDONED = "logAbandoned"; - private static final String PROP_ABANDONEDUSAGETRACKING = "abandonedUsageTracking"; - private static final String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements"; - private static final String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements"; - private static final String PROP_CONNECTIONPROPERTIES = "connectionProperties"; - private static final String PROP_MAXCONNLIFETIMEMILLIS = "maxConnLifetimeMillis"; - private static final String PROP_LOGEXPIREDCONNECTIONS = "logExpiredConnections"; + private static final String PROP_CONNECTION_INIT_SQLS = "connectionInitSqls"; + private static final String PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED = "accessToUnderlyingConnectionAllowed"; + private static final String PROP_REMOVE_ABANDONED_ON_BORROW = "removeAbandonedOnBorrow"; + private static final String PROP_REMOVE_ABANDONED_ON_MAINTENANCE = "removeAbandonedOnMaintenance"; + private static final String PROP_REMOVE_ABANDONED_TIMEOUT = "removeAbandonedTimeout"; + private static final String PROP_LOG_ABANDONED = "logAbandoned"; + private static final String PROP_ABANDONED_USAGE_TRACKING = "abandonedUsageTracking"; + private static final String PROP_POOL_PREPARED_STATEMENTS = "poolPreparedStatements"; + private static final String PROP_MAX_OPEN_PREPARED_STATEMENTS = "maxOpenPreparedStatements"; + private static final String PROP_CONNECTION_PROPERTIES = "connectionProperties"; + private static final String PROP_MAX_CONN_LIFETIME_MILLIS = "maxConnLifetimeMillis"; + private static final String PROP_LOG_EXPIRED_CONNECTIONS = "logExpiredConnections"; private static final String PROP_ROLLBACK_ON_RETURN = "rollbackOnReturn"; - private static final String PROP_ENABLE_AUTOCOMMIT_ON_RETURN = "enableAutoCommitOnReturn"; - private static final String PROP_DEFAULT_QUERYTIMEOUT = "defaultQueryTimeout"; - private static final String PROP_FASTFAIL_VALIDATION = "fastFailValidation"; + private static final String PROP_ENABLE_AUTO_COMMIT_ON_RETURN = "enableAutoCommitOnReturn"; + private static final String PROP_DEFAULT_QUERY_TIMEOUT = "defaultQueryTimeout"; + private static final String PROP_FAST_FAIL_VALIDATION = "fastFailValidation"; /** * Value string must be of the form [STATE_CODE,]* @@ -117,31 +117,31 @@ public class BasicDataSourceFactory implements ObjectFactory { * Block with obsolete properties from DBCP 1.x. Warn users that these are ignored and they should use the 2.x * properties. */ - private static final String NUPROP_MAXACTIVE = "maxActive"; - private static final String NUPROP_REMOVEABANDONED = "removeAbandoned"; + private static final String NUPROP_MAX_ACTIVE = "maxActive"; + private static final String NUPROP_REMOVE_ABANDONED = "removeAbandoned"; private static final String NUPROP_MAXWAIT = "maxWait"; /* * Block with properties expected in a DataSource This props will not be listed as ignored - we know that they may * appear in Resource, and not listing them as ignored. */ - private static final String SILENTPROP_FACTORY = "factory"; - private static final String SILENTPROP_SCOPE = "scope"; - private static final String SILENTPROP_SINGLETON = "singleton"; - private static final String SILENTPROP_AUTH = "auth"; - - private static final String[] ALL_PROPERTIES = {PROP_DEFAULTAUTOCOMMIT, PROP_DEFAULTREADONLY, - PROP_DEFAULTTRANSACTIONISOLATION, PROP_DEFAULTCATALOG, PROP_DEFAULTSCHEMA, PROP_CACHESTATE, - PROP_DRIVERCLASSNAME, PROP_LIFO, PROP_MAXTOTAL, PROP_MAXIDLE, PROP_MINIDLE, PROP_INITIALSIZE, - PROP_MAXWAITMILLIS, PROP_TESTONCREATE, PROP_TESTONBORROW, PROP_TESTONRETURN, - PROP_TIMEBETWEENEVICTIONRUNSMILLIS, PROP_NUMTESTSPEREVICTIONRUN, PROP_MINEVICTABLEIDLETIMEMILLIS, - PROP_SOFTMINEVICTABLEIDLETIMEMILLIS, PROP_EVICTIONPOLICYCLASSNAME, PROP_TESTWHILEIDLE, PROP_PASSWORD, - PROP_URL, PROP_USERNAME, PROP_VALIDATIONQUERY, PROP_VALIDATIONQUERY_TIMEOUT, PROP_CONNECTIONINITSQLS, - PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED, PROP_REMOVEABANDONEDONBORROW, PROP_REMOVEABANDONEDONMAINTENANCE, - PROP_REMOVEABANDONEDTIMEOUT, PROP_LOGABANDONED, PROP_ABANDONEDUSAGETRACKING, PROP_POOLPREPAREDSTATEMENTS, - PROP_MAXOPENPREPAREDSTATEMENTS, PROP_CONNECTIONPROPERTIES, PROP_MAXCONNLIFETIMEMILLIS, - PROP_LOGEXPIREDCONNECTIONS, PROP_ROLLBACK_ON_RETURN, PROP_ENABLE_AUTOCOMMIT_ON_RETURN, - PROP_DEFAULT_QUERYTIMEOUT, PROP_FASTFAIL_VALIDATION, PROP_DISCONNECTION_SQL_CODES, PROP_JMX_NAME }; + private static final String SILENT_PROP_FACTORY = "factory"; + private static final String SILENT_PROP_SCOPE = "scope"; + private static final String SILENT_PROP_SINGLETON = "singleton"; + private static final String SILENT_PROP_AUTH = "auth"; + + private static final String[] ALL_PROPERTIES = {PROP_DEFAULT_AUTO_COMMIT, PROP_DEFAULT_READ_ONLY, + PROP_DEFAULT_TRANSACTION_ISOLATION, PROP_DEFAULT_CATALOG, PROP_DEFAULT_SCHEMA, PROP_CACHE_STATE, + PROP_DRIVER_CLASS_NAME, PROP_LIFO, PROP_MAX_TOTAL, PROP_MAX_IDLE, PROP_MIN_IDLE, PROP_INITIAL_SIZE, + PROP_MAX_WAIT_MILLIS, PROP_TEST_ON_CREATE, PROP_TEST_ON_BORROW, PROP_TEST_ON_RETURN, + PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS, PROP_NUM_TESTS_PER_EVICTION_RUN, PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS, + PROP_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS, PROP_EVICTION_POLICY_CLASS_NAME, PROP_TEST_WHILE_IDLE, PROP_PASSWORD, + PROP_URL, PROP_USER_NAME, PROP_VALIDATION_QUERY, PROP_VALIDATION_QUERY_TIMEOUT, PROP_CONNECTION_INIT_SQLS, + PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED, PROP_REMOVE_ABANDONED_ON_BORROW, PROP_REMOVE_ABANDONED_ON_MAINTENANCE, + PROP_REMOVE_ABANDONED_TIMEOUT, PROP_LOG_ABANDONED, PROP_ABANDONED_USAGE_TRACKING, PROP_POOL_PREPARED_STATEMENTS, + PROP_MAX_OPEN_PREPARED_STATEMENTS, PROP_CONNECTION_PROPERTIES, PROP_MAX_CONN_LIFETIME_MILLIS, + PROP_LOG_EXPIRED_CONNECTIONS, PROP_ROLLBACK_ON_RETURN, PROP_ENABLE_AUTO_COMMIT_ON_RETURN, + PROP_DEFAULT_QUERY_TIMEOUT, PROP_FAST_FAIL_VALIDATION, PROP_DISCONNECTION_SQL_CODES, PROP_JMX_NAME }; /** * Obsolete properties from DBCP 1.x. with warning strings suggesting new properties. LinkedHashMap will guarantee @@ -150,16 +150,16 @@ public class BasicDataSourceFactory implements ObjectFactory { private static final Map<String, String> NUPROP_WARNTEXT = new LinkedHashMap<>(); static { - NUPROP_WARNTEXT.put(NUPROP_MAXACTIVE, - "Property " + NUPROP_MAXACTIVE + " is not used in DBCP2, use " + PROP_MAXTOTAL + " instead. " - + PROP_MAXTOTAL + " default value is " + GenericObjectPoolConfig.DEFAULT_MAX_TOTAL + "."); - NUPROP_WARNTEXT.put(NUPROP_REMOVEABANDONED, - "Property " + NUPROP_REMOVEABANDONED + " is not used in DBCP2," + " use one or both of " - + PROP_REMOVEABANDONEDONBORROW + " or " + PROP_REMOVEABANDONEDONMAINTENANCE + " instead. " + NUPROP_WARNTEXT.put(NUPROP_MAX_ACTIVE, + "Property " + NUPROP_MAX_ACTIVE + " is not used in DBCP2, use " + PROP_MAX_TOTAL + " instead. " + + PROP_MAX_TOTAL + " default value is " + GenericObjectPoolConfig.DEFAULT_MAX_TOTAL + "."); + NUPROP_WARNTEXT.put(NUPROP_REMOVE_ABANDONED, + "Property " + NUPROP_REMOVE_ABANDONED + " is not used in DBCP2," + " use one or both of " + + PROP_REMOVE_ABANDONED_ON_BORROW + " or " + PROP_REMOVE_ABANDONED_ON_MAINTENANCE + " instead. " + "Both have default value set to false."); NUPROP_WARNTEXT.put(NUPROP_MAXWAIT, - "Property " + NUPROP_MAXWAIT + " is not used in DBCP2" + " , use " + PROP_MAXWAITMILLIS + " instead. " - + PROP_MAXWAITMILLIS + " default value is " + BaseObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS + "Property " + NUPROP_MAXWAIT + " is not used in DBCP2" + " , use " + PROP_MAX_WAIT_MILLIS + " instead. " + + PROP_MAX_WAIT_MILLIS + " default value is " + BaseObjectPoolConfig.DEFAULT_MAX_WAIT_MILLIS + "."); } @@ -170,10 +170,10 @@ public class BasicDataSourceFactory implements ObjectFactory { private static final List<String> SILENT_PROPERTIES = new ArrayList<>(); static { - SILENT_PROPERTIES.add(SILENTPROP_FACTORY); - SILENT_PROPERTIES.add(SILENTPROP_SCOPE); - SILENT_PROPERTIES.add(SILENTPROP_SINGLETON); - SILENT_PROPERTIES.add(SILENTPROP_AUTH); + SILENT_PROPERTIES.add(SILENT_PROP_FACTORY); + SILENT_PROPERTIES.add(SILENT_PROP_SCOPE); + SILENT_PROPERTIES.add(SILENT_PROP_SINGLETON); + SILENT_PROPERTIES.add(SILENT_PROP_AUTH); } @@ -297,17 +297,17 @@ public class BasicDataSourceFactory implements ObjectFactory { final BasicDataSource dataSource = new BasicDataSource(); String value = null; - value = properties.getProperty(PROP_DEFAULTAUTOCOMMIT); + value = properties.getProperty(PROP_DEFAULT_AUTO_COMMIT); if (value != null) { dataSource.setDefaultAutoCommit(Boolean.valueOf(value)); } - value = properties.getProperty(PROP_DEFAULTREADONLY); + value = properties.getProperty(PROP_DEFAULT_READ_ONLY); if (value != null) { dataSource.setDefaultReadOnly(Boolean.valueOf(value)); } - value = properties.getProperty(PROP_DEFAULTTRANSACTIONISOLATION); + value = properties.getProperty(PROP_DEFAULT_TRANSACTION_ISOLATION); if (value != null) { int level = PoolableConnectionFactory.UNKNOWN_TRANSACTION_ISOLATION; if ("NONE".equalsIgnoreCase(value)) { @@ -333,22 +333,22 @@ public class BasicDataSourceFactory implements ObjectFactory { dataSource.setDefaultTransactionIsolation(level); } - value = properties.getProperty(PROP_DEFAULTCATALOG); + value = properties.getProperty(PROP_DEFAULT_CATALOG); if (value != null) { dataSource.setDefaultCatalog(value); } - value = properties.getProperty(PROP_DEFAULTSCHEMA); + value = properties.getProperty(PROP_DEFAULT_SCHEMA); if (value != null) { dataSource.setDefaultSchema(value); } - value = properties.getProperty(PROP_CACHESTATE); + value = properties.getProperty(PROP_CACHE_STATE); if (value != null) { dataSource.setCacheState(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_DRIVERCLASSNAME); + value = properties.getProperty(PROP_DRIVER_CLASS_NAME); if (value != null) { dataSource.setDriverClassName(value); } @@ -358,72 +358,72 @@ public class BasicDataSourceFactory implements ObjectFactory { dataSource.setLifo(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_MAXTOTAL); + value = properties.getProperty(PROP_MAX_TOTAL); if (value != null) { dataSource.setMaxTotal(Integer.parseInt(value)); } - value = properties.getProperty(PROP_MAXIDLE); + value = properties.getProperty(PROP_MAX_IDLE); if (value != null) { dataSource.setMaxIdle(Integer.parseInt(value)); } - value = properties.getProperty(PROP_MINIDLE); + value = properties.getProperty(PROP_MIN_IDLE); if (value != null) { dataSource.setMinIdle(Integer.parseInt(value)); } - value = properties.getProperty(PROP_INITIALSIZE); + value = properties.getProperty(PROP_INITIAL_SIZE); if (value != null) { dataSource.setInitialSize(Integer.parseInt(value)); } - value = properties.getProperty(PROP_MAXWAITMILLIS); + value = properties.getProperty(PROP_MAX_WAIT_MILLIS); if (value != null) { dataSource.setMaxWaitMillis(Long.parseLong(value)); } - value = properties.getProperty(PROP_TESTONCREATE); + value = properties.getProperty(PROP_TEST_ON_CREATE); if (value != null) { dataSource.setTestOnCreate(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_TESTONBORROW); + value = properties.getProperty(PROP_TEST_ON_BORROW); if (value != null) { dataSource.setTestOnBorrow(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_TESTONRETURN); + value = properties.getProperty(PROP_TEST_ON_RETURN); if (value != null) { dataSource.setTestOnReturn(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_TIMEBETWEENEVICTIONRUNSMILLIS); + value = properties.getProperty(PROP_TIME_BETWEEN_EVICTION_RUNS_MILLIS); if (value != null) { dataSource.setTimeBetweenEvictionRunsMillis(Long.parseLong(value)); } - value = properties.getProperty(PROP_NUMTESTSPEREVICTIONRUN); + value = properties.getProperty(PROP_NUM_TESTS_PER_EVICTION_RUN); if (value != null) { dataSource.setNumTestsPerEvictionRun(Integer.parseInt(value)); } - value = properties.getProperty(PROP_MINEVICTABLEIDLETIMEMILLIS); + value = properties.getProperty(PROP_MIN_EVICTABLE_IDLE_TIME_MILLIS); if (value != null) { dataSource.setMinEvictableIdleTimeMillis(Long.parseLong(value)); } - value = properties.getProperty(PROP_SOFTMINEVICTABLEIDLETIMEMILLIS); + value = properties.getProperty(PROP_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS); if (value != null) { dataSource.setSoftMinEvictableIdleTimeMillis(Long.parseLong(value)); } - value = properties.getProperty(PROP_EVICTIONPOLICYCLASSNAME); + value = properties.getProperty(PROP_EVICTION_POLICY_CLASS_NAME); if (value != null) { dataSource.setEvictionPolicyClassName(value); } - value = properties.getProperty(PROP_TESTWHILEIDLE); + value = properties.getProperty(PROP_TEST_WHILE_IDLE); if (value != null) { dataSource.setTestWhileIdle(Boolean.valueOf(value).booleanValue()); } @@ -438,67 +438,67 @@ public class BasicDataSourceFactory implements ObjectFactory { dataSource.setUrl(value); } - value = properties.getProperty(PROP_USERNAME); + value = properties.getProperty(PROP_USER_NAME); if (value != null) { dataSource.setUsername(value); } - value = properties.getProperty(PROP_VALIDATIONQUERY); + value = properties.getProperty(PROP_VALIDATION_QUERY); if (value != null) { dataSource.setValidationQuery(value); } - value = properties.getProperty(PROP_VALIDATIONQUERY_TIMEOUT); + value = properties.getProperty(PROP_VALIDATION_QUERY_TIMEOUT); if (value != null) { dataSource.setValidationQueryTimeout(Integer.parseInt(value)); } - value = properties.getProperty(PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED); + value = properties.getProperty(PROP_ACCESS_TO_UNDERLYING_CONNECTION_ALLOWED); if (value != null) { dataSource.setAccessToUnderlyingConnectionAllowed(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_REMOVEABANDONEDONBORROW); + value = properties.getProperty(PROP_REMOVE_ABANDONED_ON_BORROW); if (value != null) { dataSource.setRemoveAbandonedOnBorrow(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_REMOVEABANDONEDONMAINTENANCE); + value = properties.getProperty(PROP_REMOVE_ABANDONED_ON_MAINTENANCE); if (value != null) { dataSource.setRemoveAbandonedOnMaintenance(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_REMOVEABANDONEDTIMEOUT); + value = properties.getProperty(PROP_REMOVE_ABANDONED_TIMEOUT); if (value != null) { dataSource.setRemoveAbandonedTimeout(Integer.parseInt(value)); } - value = properties.getProperty(PROP_LOGABANDONED); + value = properties.getProperty(PROP_LOG_ABANDONED); if (value != null) { dataSource.setLogAbandoned(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_ABANDONEDUSAGETRACKING); + value = properties.getProperty(PROP_ABANDONED_USAGE_TRACKING); if (value != null) { dataSource.setAbandonedUsageTracking(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_POOLPREPAREDSTATEMENTS); + value = properties.getProperty(PROP_POOL_PREPARED_STATEMENTS); if (value != null) { dataSource.setPoolPreparedStatements(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_MAXOPENPREPAREDSTATEMENTS); + value = properties.getProperty(PROP_MAX_OPEN_PREPARED_STATEMENTS); if (value != null) { dataSource.setMaxOpenPreparedStatements(Integer.parseInt(value)); } - value = properties.getProperty(PROP_CONNECTIONINITSQLS); + value = properties.getProperty(PROP_CONNECTION_INIT_SQLS); if (value != null) { dataSource.setConnectionInitSqls(parseList(value, ';')); } - value = properties.getProperty(PROP_CONNECTIONPROPERTIES); + value = properties.getProperty(PROP_CONNECTION_PROPERTIES); if (value != null) { final Properties p = getProperties(value); final Enumeration<?> e = p.propertyNames(); @@ -508,12 +508,12 @@ public class BasicDataSourceFactory implements ObjectFactory { } } - value = properties.getProperty(PROP_MAXCONNLIFETIMEMILLIS); + value = properties.getProperty(PROP_MAX_CONN_LIFETIME_MILLIS); if (value != null) { dataSource.setMaxConnLifetimeMillis(Long.parseLong(value)); } - value = properties.getProperty(PROP_LOGEXPIREDCONNECTIONS); + value = properties.getProperty(PROP_LOG_EXPIRED_CONNECTIONS); if (value != null) { dataSource.setLogExpiredConnections(Boolean.valueOf(value).booleanValue()); } @@ -523,9 +523,9 @@ public class BasicDataSourceFactory implements ObjectFactory { dataSource.setJmxName(value); } - value = properties.getProperty(PROP_ENABLE_AUTOCOMMIT_ON_RETURN); + value = properties.getProperty(PROP_ENABLE_AUTO_COMMIT_ON_RETURN); if (value != null) { - dataSource.setEnableAutoCommitOnReturn(Boolean.valueOf(value).booleanValue()); + dataSource.setAutoCommitOnReturn(Boolean.valueOf(value).booleanValue()); } value = properties.getProperty(PROP_ROLLBACK_ON_RETURN); @@ -533,12 +533,12 @@ public class BasicDataSourceFactory implements ObjectFactory { dataSource.setRollbackOnReturn(Boolean.valueOf(value).booleanValue()); } - value = properties.getProperty(PROP_DEFAULT_QUERYTIMEOUT); + value = properties.getProperty(PROP_DEFAULT_QUERY_TIMEOUT); if (value != null) { dataSource.setDefaultQueryTimeout(Integer.valueOf(value)); } - value = properties.getProperty(PROP_FASTFAIL_VALIDATION); + value = properties.getProperty(PROP_FAST_FAIL_VALIDATION); if (value != null) { dataSource.setFastFailValidation(Boolean.valueOf(value).booleanValue()); } http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6c97f898/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java index 0f5a8ba..44dab43 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java @@ -209,12 +209,29 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo this.maxConnLifetimeMillis = maxConnLifetimeMillis; } + /** + * @deprecated Use {@link #isAutoCommitOnReturn()}. + */ public boolean isEnableAutoCommitOnReturn() { - return enableAutoCommitOnReturn; + return autoCommitOnReturn; } - public void setEnableAutoCommitOnReturn(final boolean enableAutoCommitOnReturn) { - this.enableAutoCommitOnReturn = enableAutoCommitOnReturn; + /** + * @since 2.6.0 + */ + public boolean isAutoCommitOnReturn() { + return autoCommitOnReturn; + } + + public void setAutoCommitOnReturn(final boolean autoCommitOnReturn) { + this.autoCommitOnReturn = autoCommitOnReturn; + } + + /** + * @deprecated Use {@link setAutoCommitOnReturn(boolean)}. + */ + public void setEnableAutoCommitOnReturn(final boolean autoCommitOnReturn) { + this.autoCommitOnReturn = autoCommitOnReturn; } public boolean isRollbackOnReturn() { @@ -407,7 +424,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo // DBCP-97 / DBCP-399 / DBCP-351 Idle connections in the pool should // have autoCommit enabled - if (enableAutoCommitOnReturn) { + if (autoCommitOnReturn) { if (connAutoCommit == null) { connAutoCommit = Boolean.valueOf(conn.getAutoCommit()); } @@ -502,7 +519,7 @@ public class PoolableConnectionFactory implements PooledObjectFactory<PoolableCo private volatile ObjectPool<PoolableConnection> pool; private Boolean defaultReadOnly; private Boolean defaultAutoCommit; - private boolean enableAutoCommitOnReturn = true; + private boolean autoCommitOnReturn = true; private boolean rollbackOnReturn = true; private int defaultTransactionIsolation = UNKNOWN_TRANSACTION_ISOLATION; private String defaultCatalog; http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/6c97f898/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java ---------------------------------------------------------------------- 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 723f41a..b852358 100644 --- a/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java +++ b/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java @@ -240,7 +240,7 @@ public class BasicManagedDataSource extends BasicDataSource { connectionFactory.setMaxOpenPreparedStatements(getMaxOpenPreparedStatements()); connectionFactory.setMaxConnLifetimeMillis(getMaxConnLifetimeMillis()); connectionFactory.setRollbackOnReturn(getRollbackOnReturn()); - connectionFactory.setEnableAutoCommitOnReturn(getEnableAutoCommitOnReturn()); + connectionFactory.setAutoCommitOnReturn(getAutoCommitOnReturn()); connectionFactory.setDefaultQueryTimeout(getDefaultQueryTimeout()); connectionFactory.setFastFailValidation(getFastFailValidation()); connectionFactory.setDisconnectionSqlCodes(getDisconnectionSqlCodes());
