Author: ggregory
Date: Mon Feb 8 21:56:48 2016
New Revision: 1729274
URL: http://svn.apache.org/viewvc?rev=1729274&view=rev
Log:
Add final modifier to local variables.
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PStmtKey.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolingDriver.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Utils.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/PoolKey.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionContext.java
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/managed/TransactionRegistry.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/StackMessageLog.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestBasicDataSourceFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingConnection.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDelegatingStatement.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestJndi.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPooling.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolableConnection.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestPoolingDriver.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterClassLoader.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterDriver.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterPreparedStatement.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterResultSet.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterStatement.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TesterUtils.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/cpdsadapter/TestDriverAdapterCPDS.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/ConnectionPoolDataSourceProxy.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/PooledConnectionProxy.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestInstanceKeyDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestKeyedCPDSConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestPerUserPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/datasources/TestSharedPoolDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestBasicManagedDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestDataSourceXAConnectionFactory.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedConnection.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSource.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TestManagedDataSourceInTx.java
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java?rev=1729274&r1=1729273&r2=1729274&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
Mon Feb 8 21:56:48 2016
@@ -126,15 +126,15 @@ public class AbandonedTrace implements T
* @return List of objects
*/
protected List<AbandonedTrace> getTrace() {
- int size = traceList.size();
+ final int size = traceList.size();
if (size == 0) {
return Collections.emptyList();
}
- ArrayList<AbandonedTrace> result = new ArrayList<>(size);
+ final ArrayList<AbandonedTrace> result = new ArrayList<>(size);
synchronized (this.traceList) {
- Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
+ final Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
while (iter.hasNext()) {
- WeakReference<AbandonedTrace> ref = iter.next();
+ final WeakReference<AbandonedTrace> ref = iter.next();
if (ref.get() == null) {
// Clean-up since we are here anyway
iter.remove();
@@ -153,9 +153,9 @@ public class AbandonedTrace implements T
*/
protected void removeTrace(AbandonedTrace trace) {
synchronized(this.traceList) {
- Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
+ final Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
while (iter.hasNext()) {
- WeakReference<AbandonedTrace> ref = iter.next();
+ final WeakReference<AbandonedTrace> ref = iter.next();
if (trace.equals(ref.get())) {
iter.remove();
break;
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1729274&r1=1729273&r2=1729274&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
Mon Feb 8 21:56:48 2016
@@ -81,8 +81,8 @@ public class BasicDataSource implements
// but the following classes are not loaded and therefore require
// explicit loading.
if (Utils.IS_SECURITY_ENABLED) {
- ClassLoader loader = BasicDataSource.class.getClassLoader();
- String dbcpPackageName =
BasicDataSource.class.getPackage().getName();
+ final ClassLoader loader =
BasicDataSource.class.getClassLoader();
+ final String dbcpPackageName =
BasicDataSource.class.getPackage().getName();
loader.loadClass(dbcpPackageName +
".BasicDataSource$PaGetConnection");
loader.loadClass(dbcpPackageName +
".DelegatingCallableStatement");
loader.loadClass(dbcpPackageName +
".DelegatingDatabaseMetaData");
@@ -93,11 +93,11 @@ public class BasicDataSource implements
loader.loadClass(dbcpPackageName +
".PoolingConnection$StatementType");
loader.loadClass(dbcpPackageName + ".PStmtKey");
- String poolPackageName =
PooledObject.class.getPackage().getName();
+ final String poolPackageName =
PooledObject.class.getPackage().getName();
loader.loadClass(poolPackageName +
".impl.LinkedBlockingDeque$Node");
loader.loadClass(poolPackageName +
".impl.GenericKeyedObjectPool$ObjectDeque");
}
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
throw new IllegalStateException("Unable to pre-load classes",
cnfe);
}
}
@@ -978,7 +978,7 @@ public class BasicDataSource implements
@Override
public int getNumActive() {
// Copy reference to avoid NPE if close happens after null check
- GenericObjectPool<PoolableConnection> pool = connectionPool;
+ final GenericObjectPool<PoolableConnection> pool = connectionPool;
if (pool != null) {
return pool.getNumActive();
}
@@ -995,7 +995,7 @@ public class BasicDataSource implements
@Override
public int getNumIdle() {
// Copy reference to avoid NPE if close happens after null check
- GenericObjectPool<PoolableConnection> pool = connectionPool;
+ final GenericObjectPool<PoolableConnection> pool = connectionPool;
if (pool != null) {
return pool.getNumIdle();
}
@@ -1183,7 +1183,7 @@ public class BasicDataSource implements
* @return initialization SQL statements
*/
public List<String> getConnectionInitSqls() {
- List<String> result = connectionInitSqls;
+ final List<String> result = connectionInitSqls;
if (result == null) {
return Collections.emptyList();
}
@@ -1196,7 +1196,7 @@ public class BasicDataSource implements
*/
@Override
public String[] getConnectionInitSqlsAsArray() {
- Collection<String> result = getConnectionInitSqls();
+ final Collection<String> result = getConnectionInitSqls();
return result.toArray(new String[result.size()]);
}
@@ -1215,7 +1215,7 @@ public class BasicDataSource implements
public void setConnectionInitSqls(Collection<String> connectionInitSqls) {
if (connectionInitSqls != null && connectionInitSqls.size() > 0) {
ArrayList<String> newVal = null;
- for (String s : connectionInitSqls) {
+ for (final String s : connectionInitSqls) {
if (s != null && s.trim().length() > 0) {
if (newVal == null) {
newVal = new ArrayList<>();
@@ -1386,7 +1386,7 @@ public class BasicDataSource implements
* @since 2.1
*/
public Set<String> getDisconnectionSqlCodes() {
- Set<String> result = disconnectionSqlCodes;
+ final Set<String> result = disconnectionSqlCodes;
if (result == null) {
return Collections.emptySet();
}
@@ -1400,7 +1400,7 @@ public class BasicDataSource implements
*/
@Override
public String[] getDisconnectionSqlCodesAsArray() {
- Collection<String> result = getDisconnectionSqlCodes();
+ final Collection<String> result = getDisconnectionSqlCodes();
return result.toArray(new String[result.size()]);
}
@@ -1429,7 +1429,7 @@ public class BasicDataSource implements
public void setDisconnectionSqlCodes(Collection<String>
disconnectionSqlCodes) {
if (disconnectionSqlCodes != null && disconnectionSqlCodes.size() > 0)
{
HashSet<String> newVal = null;
- for (String s : disconnectionSqlCodes) {
+ for (final String s : disconnectionSqlCodes) {
if (s != null && s.trim().length() > 0) {
if (newVal == null) {
newVal = new HashSet<>();
@@ -1519,11 +1519,11 @@ public class BasicDataSource implements
@Override
public Connection getConnection() throws SQLException {
if (Utils.IS_SECURITY_ENABLED) {
- PrivilegedExceptionAction<Connection> action = new
PaGetConnection();
+ final PrivilegedExceptionAction<Connection> action = new
PaGetConnection();
try {
return AccessController.doPrivileged(action);
- } catch (PrivilegedActionException e) {
- Throwable cause = e.getCause();
+ } catch (final PrivilegedActionException e) {
+ final Throwable cause = e.getCause();
if (cause instanceof SQLException) {
throw (SQLException) cause;
}
@@ -1873,14 +1873,14 @@ public class BasicDataSource implements
throw new NullPointerException("connectionProperties is null");
}
- String[] entries = connectionProperties.split(";");
- Properties properties = new Properties();
- for (String entry : entries) {
+ final String[] entries = connectionProperties.split(";");
+ final Properties properties = new Properties();
+ for (final String entry : entries) {
if (entry.length() > 0) {
- int index = entry.indexOf('=');
+ final int index = entry.indexOf('=');
if (index > 0) {
- String name = entry.substring(0, index);
- String value = entry.substring(index + 1);
+ final String name = entry.substring(0, index);
+ final String value = entry.substring(index + 1);
properties.setProperty(name, value);
} else {
// no value is empty string which is how
java.util.Properties works
@@ -1912,26 +1912,26 @@ public class BasicDataSource implements
@Override
public synchronized void close() throws SQLException {
if (registeredJmxName != null) {
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
try {
mbs.unregisterMBean(registeredJmxName);
- } catch (JMException e) {
+ } catch (final JMException e) {
log.warn("Failed to unregister the JMX name: " +
registeredJmxName, e);
} finally {
registeredJmxName = null;
}
}
closed = true;
- GenericObjectPool<?> oldpool = connectionPool;
+ final GenericObjectPool<?> oldpool = connectionPool;
connectionPool = null;
dataSource = null;
try {
if (oldpool != null) {
oldpool.close();
}
- } catch(RuntimeException e) {
+ } catch(final RuntimeException e) {
throw e;
- } catch(Exception e) {
+ } catch(final Exception e) {
throw new SQLException(Utils.getMessage("pool.close.fail"), e);
}
}
@@ -1983,13 +1983,13 @@ public class BasicDataSource implements
throw new IllegalStateException(
"Cannot invalidate connection: Connection is not a
poolable connection.");
}
- } catch (SQLException e) {
+ } catch (final SQLException e) {
throw new IllegalStateException("Cannot invalidate connection:
Unwrapping poolable connection failed.", e);
}
try {
connectionPool.invalidateObject(poolableConnection);
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new IllegalStateException("Invalidating connection threw
unexpected exception", e);
}
}
@@ -2023,7 +2023,7 @@ public class BasicDataSource implements
jmxRegister();
// create factory which returns raw physical connections
- ConnectionFactory driverConnectionFactory =
createConnectionFactory();
+ final ConnectionFactory driverConnectionFactory =
createConnectionFactory();
// Set up the poolable connection factory
boolean success = false;
@@ -2036,11 +2036,11 @@ public class BasicDataSource implements
poolableConnectionFactory.setMaxOpenPrepatedStatements(
maxOpenPreparedStatements);
success = true;
- } catch (SQLException se) {
+ } catch (final SQLException se) {
throw se;
- } catch (RuntimeException rte) {
+ } catch (final RuntimeException rte) {
throw rte;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new SQLException("Error creating connection factory",
ex);
}
@@ -2056,11 +2056,11 @@ public class BasicDataSource implements
newDataSource = createDataSourceInstance();
newDataSource.setLogWriter(logWriter);
success = true;
- } catch (SQLException se) {
+ } catch (final SQLException se) {
throw se;
- } catch (RuntimeException rte) {
+ } catch (final RuntimeException rte) {
throw rte;
- } catch (Exception ex) {
+ } catch (final Exception ex) {
throw new SQLException("Error creating datasource", ex);
} finally {
if (!success) {
@@ -2073,7 +2073,7 @@ public class BasicDataSource implements
for (int i = 0 ; i < initialSize ; i++) {
connectionPool.addObject();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
closeConnectionPool();
throw new SQLException("Error preloading the connection pool",
e);
}
@@ -2119,13 +2119,13 @@ public class BasicDataSource implements
driverFromCCL = Class.forName(
driverClassName, true, driverClassLoader);
}
- } catch (ClassNotFoundException cnfe) {
+ } catch (final ClassNotFoundException cnfe) {
driverFromCCL = Thread.currentThread(
).getContextClassLoader().loadClass(
driverClassName);
}
- } catch (Exception t) {
- String message = "Cannot load JDBC driver class '" +
+ } catch (final Exception t) {
+ final String message = "Cannot load JDBC driver class '" +
driverClassName + "'";
logWriter.println(message);
t.printStackTrace(logWriter);
@@ -2145,8 +2145,8 @@ public class BasicDataSource implements
throw new SQLException("No suitable driver", "08001");
}
}
- } catch (Exception t) {
- String message = "Cannot create JDBC driver of class '" +
+ } catch (final Exception t) {
+ final String message = "Cannot create JDBC driver of class '" +
(driverClassName != null ? driverClassName : "") +
"' for connect URL '" + url + "'";
logWriter.println(message);
@@ -2156,21 +2156,21 @@ public class BasicDataSource implements
}
// Set up the driver connection factory we will use
- String user = username;
+ final String user = username;
if (user != null) {
connectionProperties.put("user", user);
} else {
log("DBCP DataSource configured without a 'username'");
}
- String pwd = password;
+ final String pwd = password;
if (pwd != null) {
connectionProperties.put("password", pwd);
} else {
log("DBCP DataSource configured without a 'password'");
}
- ConnectionFactory driverConnectionFactory =
+ final ConnectionFactory driverConnectionFactory =
new DriverConnectionFactory(driverToUse, url,
connectionProperties);
return driverConnectionFactory;
}
@@ -2187,7 +2187,7 @@ public class BasicDataSource implements
*/
protected void createConnectionPool(PoolableConnectionFactory factory) {
// Create an object pool to contain our active connections
- GenericObjectPoolConfig config = new GenericObjectPoolConfig();
+ final GenericObjectPoolConfig config = new GenericObjectPoolConfig();
updateJmxName(config);
config.setJmxEnabled(registeredJmxName != null); // Disable JMX on
the underlying pool if the DS is not registered.
GenericObjectPool<PoolableConnection> gop;
@@ -2220,13 +2220,13 @@ public class BasicDataSource implements
* Closes the connection pool, silently swallowing any exception that
occurs.
*/
private void closeConnectionPool() {
- GenericObjectPool<?> oldpool = connectionPool;
+ final GenericObjectPool<?> oldpool = connectionPool;
connectionPool = null;
try {
if (oldpool != null) {
oldpool.close();
}
- } catch(Exception e) {
+ } catch(final Exception e) {
/* Ignore */
}
}
@@ -2247,7 +2247,7 @@ public class BasicDataSource implements
* @throws SQLException if unable to create a datasource instance
*/
protected DataSource createDataSourceInstance() throws SQLException {
- PoolingDataSource<PoolableConnection> pds = new
PoolingDataSource<>(connectionPool);
+ final PoolingDataSource<PoolableConnection> pds = new
PoolingDataSource<>(connectionPool);
pds.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed());
return pds;
}
@@ -2281,9 +2281,9 @@ public class BasicDataSource implements
connectionFactory.setFastFailValidation(fastFailValidation);
connectionFactory.setDisconnectionSqlCodes(disconnectionSqlCodes);
validateConnectionFactory(connectionFactory);
- } catch (RuntimeException e) {
+ } catch (final RuntimeException e) {
throw e;
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new SQLException("Cannot create PoolableConnectionFactory ("
+ e.getMessage() + ")", e);
}
return connectionFactory;
@@ -2324,20 +2324,20 @@ public class BasicDataSource implements
return;
}
// Return immediately if no JMX name has been specified
- String requestedName = getJmxName();
+ final String requestedName = getJmxName();
if (requestedName == null) {
return;
}
ObjectName oname;
try {
oname = new ObjectName(requestedName);
- } catch (MalformedObjectNameException e) {
+ } catch (final MalformedObjectNameException e) {
log.warn("The requested JMX name [" + requestedName +
"] was not valid and will be ignored.");
return;
}
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ final MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
try {
mbs.registerMBean(this, oname);
} catch (InstanceAlreadyExistsException | MBeanRegistrationException
@@ -2348,11 +2348,11 @@ public class BasicDataSource implements
@Override
public ObjectName preRegister(MBeanServer server, ObjectName name) {
- String requestedName = getJmxName();
+ final String requestedName = getJmxName();
if (requestedName != null) {
try {
registeredJmxName = new ObjectName(requestedName);
- } catch (MalformedObjectNameException e) {
+ } catch (final MalformedObjectNameException e) {
log.warn("The requested JMX name [" + requestedName +
"] was not valid and will be ignored.");
}
@@ -2382,7 +2382,7 @@ public class BasicDataSource implements
if (registeredJmxName == null) {
return;
}
- StringBuilder base = new StringBuilder(registeredJmxName.toString());
+ final StringBuilder base = new
StringBuilder(registeredJmxName.toString());
base.append(Constants.JMX_CONNECTION_POOL_BASE_EXT);
config.setJmxNameBase(base.toString());
config.setJmxNamePrefix(Constants.JMX_CONNECTION_POOL_PREFIX);
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java?rev=1729274&r1=1729273&r2=1729274&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceFactory.java
Mon Feb 8 21:56:48 2016
@@ -248,7 +248,7 @@ public class BasicDataSourceFactory impl
if (obj == null || !(obj instanceof Reference)) {
return null;
}
- Reference ref = (Reference) obj;
+ final Reference ref = (Reference) obj;
if (!"javax.sql.DataSource".equals(ref.getClassName())) {
return null;
}
@@ -257,18 +257,18 @@ public class BasicDataSourceFactory impl
final List<String> warnings = new ArrayList<>();
final List<String> infoMessages = new ArrayList<>();
validatePropertyNames(ref, name, warnings, infoMessages);
- for (String warning : warnings) {
+ for (final String warning : warnings) {
log.warn(warning);
}
- for (String infoMessage : infoMessages) {
+ for (final String infoMessage : infoMessages) {
log.info(infoMessage);
}
- Properties properties = new Properties();
- for (String propertyName : ALL_PROPERTIES) {
- RefAddr ra = ref.get(propertyName);
+ final Properties properties = new Properties();
+ for (final String propertyName : ALL_PROPERTIES) {
+ final RefAddr ra = ref.get(propertyName);
if (ra != null) {
- String propertyValue = ra.getContent().toString();
+ final String propertyValue = ra.getContent().toString();
properties.setProperty(propertyName, propertyValue);
}
}
@@ -290,7 +290,7 @@ public class BasicDataSourceFactory impl
final List<String> allPropsAsList = Arrays.asList(ALL_PROPERTIES);
final String nameString = name != null ? "Name = " + name.toString() +
" " : "";
if (NUPROP_WARNTEXT!=null && !NUPROP_WARNTEXT.keySet().isEmpty()) {
- for (String propertyName : NUPROP_WARNTEXT.keySet()) {
+ for (final String propertyName : NUPROP_WARNTEXT.keySet()) {
final RefAddr ra = ref.get(propertyName);
if (ra != null && !allPropsAsList.contains(ra.getType())) {
final StringBuilder stringBuilder = new
StringBuilder(nameString);
@@ -336,7 +336,7 @@ public class BasicDataSourceFactory impl
* @throws Exception if an error occurs creating the data source
*/
public static BasicDataSource createDataSource(Properties properties)
throws Exception {
- BasicDataSource dataSource = new BasicDataSource();
+ final BasicDataSource dataSource = new BasicDataSource();
String value = null;
value = properties.getProperty(PROP_DEFAULTAUTOCOMMIT);
@@ -370,7 +370,7 @@ public class BasicDataSourceFactory impl
else {
try {
level = Integer.parseInt(value);
- } catch (NumberFormatException e) {
+ } catch (final NumberFormatException e) {
System.err.println("Could not parse
defaultTransactionIsolation: " + value);
System.err.println("WARNING: defaultTransactionIsolation
not set");
System.err.println("using default value of database
driver");
@@ -542,10 +542,10 @@ public class BasicDataSourceFactory impl
value = properties.getProperty(PROP_CONNECTIONPROPERTIES);
if (value != null) {
- Properties p = getProperties(value);
- Enumeration<?> e = p.propertyNames();
+ final Properties p = getProperties(value);
+ final Enumeration<?> e = p.propertyNames();
while (e.hasMoreElements()) {
- String propertyName = (String) e.nextElement();
+ final String propertyName = (String) e.nextElement();
dataSource.addConnectionProperty(propertyName,
p.getProperty(propertyName));
}
}
@@ -607,7 +607,7 @@ public class BasicDataSourceFactory impl
* @throws Exception
*/
private static Properties getProperties(String propText) throws Exception {
- Properties p = new Properties();
+ final Properties p = new Properties();
if (propText != null) {
p.load(new ByteArrayInputStream(
propText.replace(';',
'\n').getBytes(StandardCharsets.ISO_8859_1)));
@@ -622,8 +622,8 @@ public class BasicDataSourceFactory impl
* @return String Collection of values
*/
private static Collection<String> parseList(String value, char delimiter) {
- StringTokenizer tokenizer = new StringTokenizer(value,
Character.toString(delimiter));
- Collection<String> tokens = new ArrayList<>(tokenizer.countTokens());
+ final StringTokenizer tokenizer = new StringTokenizer(value,
Character.toString(delimiter));
+ final Collection<String> tokens = new
ArrayList<>(tokenizer.countTokens());
while (tokenizer.hasMoreTokens()) {
tokens.add(tokenizer.nextToken());
}
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java?rev=1729274&r1=1729273&r2=1729274&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
Mon Feb 8 21:56:48 2016
@@ -72,209 +72,209 @@ public class DelegatingCallableStatement
@Override
public void registerOutParameter(int parameterIndex, int sqlType) throws
SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter( parameterIndex,
sqlType); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter( parameterIndex,
sqlType); } catch (final SQLException e) { handleException(e); } }
@Override
public void registerOutParameter(int parameterIndex, int sqlType, int
scale) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter( parameterIndex,
sqlType, scale); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter( parameterIndex,
sqlType, scale); } catch (final SQLException e) { handleException(e); } }
@Override
public boolean wasNull() throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).wasNull();
} catch (SQLException e) { handleException(e); return false; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).wasNull();
} catch (final SQLException e) { handleException(e); return false; } }
@Override
public String getString(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getString(
parameterIndex); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getString(
parameterIndex); } catch (final SQLException e) { handleException(e); return
null; } }
@Override
public boolean getBoolean(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getBoolean(
parameterIndex); } catch (SQLException e) { handleException(e); return false; }
}
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getBoolean(
parameterIndex); } catch (final SQLException e) { handleException(e); return
false; } }
@Override
public byte getByte(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getByte(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getByte(
parameterIndex); } catch (final SQLException e) { handleException(e); return 0;
} }
@Override
public short getShort(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getShort(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getShort(
parameterIndex); } catch (final SQLException e) { handleException(e); return 0;
} }
@Override
public int getInt(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getInt(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getInt(
parameterIndex); } catch (final SQLException e) { handleException(e); return 0;
} }
@Override
public long getLong(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getLong(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getLong(
parameterIndex); } catch (final SQLException e) { handleException(e); return 0;
} }
@Override
public float getFloat(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getFloat(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getFloat(
parameterIndex); } catch (final SQLException e) { handleException(e); return 0;
} }
@Override
public double getDouble(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getDouble(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getDouble(
parameterIndex); } catch (final SQLException e) { handleException(e); return 0;
} }
/** @deprecated Use {@link #getBigDecimal(int)} or {@link
#getBigDecimal(String)} */
@Override
@Deprecated
public BigDecimal getBigDecimal(int parameterIndex, int scale) throws
SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getBigDecimal( parameterIndex, scale); }
catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getBigDecimal( parameterIndex, scale); }
catch (final SQLException e) { handleException(e); return null; } }
@Override
public byte[] getBytes(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getBytes(
parameterIndex); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getBytes(
parameterIndex); } catch (final SQLException e) { handleException(e); return
null; } }
@Override
public Date getDate(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getDate(
parameterIndex); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getDate(
parameterIndex); } catch (final SQLException e) { handleException(e); return
null; } }
@Override
public Time getTime(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getTime(
parameterIndex); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getTime(
parameterIndex); } catch (final SQLException e) { handleException(e); return
null; } }
@Override
public Timestamp getTimestamp(int parameterIndex) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp( parameterIndex); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp( parameterIndex); } catch
(final SQLException e) { handleException(e); return null; } }
@Override
public Object getObject(int parameterIndex) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getObject(
parameterIndex); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getObject(
parameterIndex); } catch (final SQLException e) { handleException(e); return
null; } }
@Override
public BigDecimal getBigDecimal(int parameterIndex) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getBigDecimal( parameterIndex); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getBigDecimal( parameterIndex); } catch
(final SQLException e) { handleException(e); return null; } }
@Override
public Object getObject(int i, Map<String,Class<?>> map) throws
SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getObject(
i, map); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getObject(
i, map); } catch (final SQLException e) { handleException(e); return null; } }
@Override
public Ref getRef(int i) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getRef( i);
} catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getRef( i);
} catch (final SQLException e) { handleException(e); return null; } }
@Override
public Blob getBlob(int i) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getBlob(
i); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getBlob(
i); } catch (final SQLException e) { handleException(e); return null; } }
@Override
public Clob getClob(int i) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getClob(
i); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getClob(
i); } catch (final SQLException e) { handleException(e); return null; } }
@Override
public Array getArray(int i) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getArray(
i); } catch (SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getArray(
i); } catch (final SQLException e) { handleException(e); return null; } }
@Override
public Date getDate(int parameterIndex, Calendar cal) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getDate(
parameterIndex, cal); } catch (SQLException e) { handleException(e); return
null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getDate(
parameterIndex, cal); } catch (final SQLException e) { handleException(e);
return null; } }
@Override
public Time getTime(int parameterIndex, Calendar cal) throws SQLException
- { checkOpen(); try { return ((CallableStatement)getDelegate()).getTime(
parameterIndex, cal); } catch (SQLException e) { handleException(e); return
null; } }
+ { checkOpen(); try { return ((CallableStatement)getDelegate()).getTime(
parameterIndex, cal); } catch (final SQLException e) { handleException(e);
return null; } }
@Override
public Timestamp getTimestamp(int parameterIndex, Calendar cal) throws
SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp( parameterIndex, cal); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp( parameterIndex, cal); } catch
(final SQLException e) { handleException(e); return null; } }
@Override
public void registerOutParameter(int paramIndex, int sqlType, String
typeName) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter( paramIndex, sqlType,
typeName); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter( paramIndex, sqlType,
typeName); } catch (final SQLException e) { handleException(e); } }
@Override
public void registerOutParameter(String parameterName, int sqlType) throws
SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter(parameterName,
sqlType); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter(parameterName,
sqlType); } catch (final SQLException e) { handleException(e); } }
@Override
public void registerOutParameter(String parameterName, int sqlType, int
scale) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter(parameterName, sqlType,
scale); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter(parameterName, sqlType,
scale); } catch (final SQLException e) { handleException(e); } }
@Override
public void registerOutParameter(String parameterName, int sqlType, String
typeName) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter(parameterName, sqlType,
typeName); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).registerOutParameter(parameterName, sqlType,
typeName); } catch (final SQLException e) { handleException(e); } }
@Override
public URL getURL(int parameterIndex) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getURL(parameterIndex); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getURL(parameterIndex); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public void setURL(String parameterName, URL val) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setURL(parameterName, val); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setURL(parameterName, val); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setNull(String parameterName, int sqlType) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setNull(parameterName, sqlType); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setNull(parameterName, sqlType); } catch
(final SQLException e) { handleException(e); } }
@Override
public void setBoolean(String parameterName, boolean x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setBoolean(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setBoolean(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setByte(String parameterName, byte x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setByte(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setByte(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setShort(String parameterName, short x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setShort(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setShort(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setInt(String parameterName, int x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setInt(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setInt(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setLong(String parameterName, long x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setLong(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setLong(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setFloat(String parameterName, float x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setFloat(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setFloat(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setDouble(String parameterName, double x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setDouble(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setDouble(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setBigDecimal(String parameterName, BigDecimal x) throws
SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setBigDecimal(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setBigDecimal(parameterName, x); } catch
(final SQLException e) { handleException(e); } }
@Override
public void setString(String parameterName, String x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setString(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setString(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setBytes(String parameterName, byte [] x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setBytes(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setBytes(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setDate(String parameterName, Date x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setDate(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setDate(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setTime(String parameterName, Time x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setTime(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setTime(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setTimestamp(String parameterName, Timestamp x) throws
SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setTimestamp(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setTimestamp(parameterName, x); } catch
(final SQLException e) { handleException(e); } }
@Override
public void setAsciiStream(String parameterName, InputStream x, int
length) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setAsciiStream(parameterName, x, length); }
catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setAsciiStream(parameterName, x, length); }
catch (final SQLException e) { handleException(e); } }
@Override
public void setBinaryStream(String parameterName, InputStream x, int
length) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setBinaryStream(parameterName, x, length); }
catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setBinaryStream(parameterName, x, length); }
catch (final SQLException e) { handleException(e); } }
@Override
public void setObject(String parameterName, Object x, int targetSqlType,
int scale) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setObject(parameterName, x, targetSqlType,
scale); } catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setObject(parameterName, x, targetSqlType,
scale); } catch (final SQLException e) { handleException(e); } }
@Override
public void setObject(String parameterName, Object x, int targetSqlType)
throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setObject(parameterName, x, targetSqlType);
} catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setObject(parameterName, x, targetSqlType);
} catch (final SQLException e) { handleException(e); } }
@Override
public void setObject(String parameterName, Object x) throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setObject(parameterName, x); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setObject(parameterName, x); } catch (final
SQLException e) { handleException(e); } }
@Override
public void setCharacterStream(String parameterName, Reader reader, int
length) throws SQLException
@@ -282,111 +282,111 @@ public class DelegatingCallableStatement
@Override
public void setDate(String parameterName, Date x, Calendar cal) throws
SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setDate(parameterName, x, cal); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setDate(parameterName, x, cal); } catch
(final SQLException e) { handleException(e); } }
@Override
public void setTime(String parameterName, Time x, Calendar cal) throws
SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setTime(parameterName, x, cal); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setTime(parameterName, x, cal); } catch
(final SQLException e) { handleException(e); } }
@Override
public void setTimestamp(String parameterName, Timestamp x, Calendar cal)
throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setTimestamp(parameterName, x, cal); } catch
(SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setTimestamp(parameterName, x, cal); } catch
(final SQLException e) { handleException(e); } }
@Override
public void setNull(String parameterName, int sqlType, String typeName)
throws SQLException
- { checkOpen(); try {
((CallableStatement)getDelegate()).setNull(parameterName, sqlType, typeName); }
catch (SQLException e) { handleException(e); } }
+ { checkOpen(); try {
((CallableStatement)getDelegate()).setNull(parameterName, sqlType, typeName); }
catch (final SQLException e) { handleException(e); } }
@Override
public String getString(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getString(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getString(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public boolean getBoolean(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getBoolean(parameterName); } catch
(SQLException e) { handleException(e); return false; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getBoolean(parameterName); } catch (final
SQLException e) { handleException(e); return false; } }
@Override
public byte getByte(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getByte(parameterName); } catch
(SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getByte(parameterName); } catch (final
SQLException e) { handleException(e); return 0; } }
@Override
public short getShort(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getShort(parameterName); } catch
(SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getShort(parameterName); } catch (final
SQLException e) { handleException(e); return 0; } }
@Override
public int getInt(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getInt(parameterName); } catch (SQLException
e) { handleException(e); return 0; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getInt(parameterName); } catch (final
SQLException e) { handleException(e); return 0; } }
@Override
public long getLong(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getLong(parameterName); } catch
(SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getLong(parameterName); } catch (final
SQLException e) { handleException(e); return 0; } }
@Override
public float getFloat(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getFloat(parameterName); } catch
(SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getFloat(parameterName); } catch (final
SQLException e) { handleException(e); return 0; } }
@Override
public double getDouble(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getDouble(parameterName); } catch
(SQLException e) { handleException(e); return 0; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getDouble(parameterName); } catch (final
SQLException e) { handleException(e); return 0; } }
@Override
public byte[] getBytes(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getBytes(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getBytes(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Date getDate(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getDate(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getDate(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Time getTime(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getTime(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getTime(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Timestamp getTimestamp(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Object getObject(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getObject(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getObject(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public BigDecimal getBigDecimal(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getBigDecimal(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getBigDecimal(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Object getObject(String parameterName, Map<String,Class<?>> map)
throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getObject(parameterName, map); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getObject(parameterName, map); } catch
(final SQLException e) { handleException(e); return null; } }
@Override
public Ref getRef(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getRef(parameterName); } catch (SQLException
e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getRef(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Blob getBlob(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getBlob(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getBlob(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Clob getClob(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getClob(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getClob(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Array getArray(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getArray(parameterName); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getArray(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Date getDate(String parameterName, Calendar cal) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getDate(parameterName, cal); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getDate(parameterName, cal); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Time getTime(String parameterName, Calendar cal) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getTime(parameterName, cal); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getTime(parameterName, cal); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
public Timestamp getTimestamp(String parameterName, Calendar cal) throws
SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp(parameterName, cal); } catch
(SQLException e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getTimestamp(parameterName, cal); } catch
(final SQLException e) { handleException(e); return null; } }
@Override
public URL getURL(String parameterName) throws SQLException
- { checkOpen(); try { return
((CallableStatement)getDelegate()).getURL(parameterName); } catch (SQLException
e) { handleException(e); return null; } }
+ { checkOpen(); try { return
((CallableStatement)getDelegate()).getURL(parameterName); } catch (final
SQLException e) { handleException(e); return null; } }
@Override
@@ -395,7 +395,7 @@ public class DelegatingCallableStatement
try {
return ((CallableStatement)getDelegate()).getRowId(parameterIndex);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -407,7 +407,7 @@ public class DelegatingCallableStatement
try {
return ((CallableStatement)getDelegate()).getRowId(parameterName);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -419,7 +419,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setRowId(parameterName, value);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -430,7 +430,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setNString(parameterName,
value);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -441,7 +441,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setNCharacterStream(parameterName, reader,
length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -452,7 +452,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setNClob(parameterName, value);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -463,7 +463,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setClob(parameterName, reader,
length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -474,7 +474,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setBlob(parameterName,
inputStream, length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -485,7 +485,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setNClob(parameterName, reader,
length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -496,7 +496,7 @@ public class DelegatingCallableStatement
try {
return ((CallableStatement)getDelegate()).getNClob(parameterIndex);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -508,7 +508,7 @@ public class DelegatingCallableStatement
try {
return ((CallableStatement)getDelegate()).getNClob(parameterName);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -520,7 +520,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setSQLXML(parameterName, value);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -531,7 +531,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getSQLXML(parameterIndex);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -543,7 +543,7 @@ public class DelegatingCallableStatement
try {
return ((CallableStatement)getDelegate()).getSQLXML(parameterName);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -555,7 +555,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getNString(parameterIndex);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -567,7 +567,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getNString(parameterName);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -579,7 +579,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getNCharacterStream(parameterIndex);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -591,7 +591,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getNCharacterStream(parameterName);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -603,7 +603,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getCharacterStream(parameterIndex);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -615,7 +615,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getCharacterStream(parameterName);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -627,7 +627,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setBlob(parameterName, blob);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -638,7 +638,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setClob(parameterName, clob);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -649,7 +649,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setAsciiStream(parameterName,
inputStream, length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -660,7 +660,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setBinaryStream(parameterName,
inputStream, length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -671,7 +671,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setCharacterStream(parameterName, reader,
length);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -682,7 +682,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setAsciiStream(parameterName,
inputStream);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -693,7 +693,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setBinaryStream(parameterName,
inputStream);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -704,7 +704,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setCharacterStream(parameterName, reader);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -715,7 +715,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setNCharacterStream(parameterName, reader);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -726,7 +726,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setClob(parameterName, reader);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -737,7 +737,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setBlob(parameterName,
inputStream);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -748,7 +748,7 @@ public class DelegatingCallableStatement
try {
((CallableStatement)getDelegate()).setNClob(parameterName, reader);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
}
}
@@ -760,7 +760,7 @@ public class DelegatingCallableStatement
try {
return
((CallableStatement)getDelegate()).getObject(parameterIndex, type);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
@@ -773,7 +773,7 @@ public class DelegatingCallableStatement
try {
return ((CallableStatement)getDelegate()).getObject(parameterName,
type);
}
- catch (SQLException e) {
+ catch (final SQLException e) {
handleException(e);
return null;
}
