You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2011/05/05 19:19:04 UTC
svn commit: r1099879 [3/4] - in /commons/proper/dbcp/trunk/src:
java/org/apache/commons/dbcp2/ java/org/apache/commons/dbcp2/cpdsadapter/
java/org/apache/commons/dbcp2/datasources/
java/org/apache/commons/dbcp2/managed/ java/org/apache/commons/jocl2/ t...
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSource.java Thu May 5 17:19:01 2011
@@ -87,6 +87,7 @@ public class PerUserPoolDataSource
/**
* Close pool(s) being maintained by this datasource.
*/
+ @Override
public void close() {
for (Iterator poolIter = managers.values().iterator();
poolIter.hasNext();) {
@@ -368,6 +369,7 @@ public class PerUserPoolDataSource
// ----------------------------------------------------------------------
// Inherited abstract methods
+ @Override
protected PooledConnectionAndInfo
getPooledConnectionAndInfo(String username, String password)
throws SQLException {
@@ -425,6 +427,7 @@ public class PerUserPoolDataSource
return info;
}
+ @Override
protected void setupDefaults(Connection con, String username)
throws SQLException {
boolean defaultAutoCommit = isDefaultAutoCommit();
@@ -464,6 +467,7 @@ public class PerUserPoolDataSource
}
}
+ @Override
protected PooledConnectionManager getConnectionManager(UserPassKey upkey) {
return (PooledConnectionManager) managers.get(getPoolKey(
upkey.getUsername(), upkey.getPassword()));
@@ -474,6 +478,7 @@ public class PerUserPoolDataSource
*
* @since 1.2.2
*/
+ @Override
public Reference getReference() throws NamingException {
Reference ref = new Reference(getClass().getName(),
PerUserPoolDataSourceFactory.class.getName(), null);
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PerUserPoolDataSourceFactory.java Thu May 5 17:19:01 2011
@@ -34,10 +34,12 @@ public class PerUserPoolDataSourceFactor
private static final String PER_USER_POOL_CLASSNAME =
PerUserPoolDataSource.class.getName();
+ @Override
protected boolean isCorrectClass(String className) {
return PER_USER_POOL_CLASSNAME.equals(className);
}
+ @Override
protected InstanceKeyDataSource getNewInstance(Reference ref)
throws IOException, ClassNotFoundException {
PerUserPoolDataSource pupds = new PerUserPoolDataSource();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/PoolKey.java Thu May 5 17:19:01 2011
@@ -33,6 +33,7 @@ class PoolKey implements Serializable {
this.username = username;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof PoolKey) {
PoolKey pk = (PoolKey)obj;
@@ -43,6 +44,7 @@ class PoolKey implements Serializable {
}
}
+ @Override
public int hashCode() {
int h = 0;
if (datasourceName != null) {
@@ -54,6 +56,7 @@ class PoolKey implements Serializable {
return h;
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer(50);
sb.append("PoolKey(");
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSource.java Thu May 5 17:19:01 2011
@@ -70,6 +70,7 @@ public class SharedPoolDataSource
/**
* Close pool being maintained by this datasource.
*/
+ @Override
public void close() throws Exception {
if (pool != null) {
pool.close();
@@ -159,6 +160,7 @@ public class SharedPoolDataSource
// ----------------------------------------------------------------------
// Inherited abstract methods
+ @Override
protected PooledConnectionAndInfo
getPooledConnectionAndInfo(String username, String password)
throws SQLException {
@@ -187,6 +189,7 @@ public class SharedPoolDataSource
return info;
}
+ @Override
protected PooledConnectionManager getConnectionManager(UserPassKey upkey) {
return factory;
}
@@ -196,6 +199,7 @@ public class SharedPoolDataSource
*
* @since 1.2.2
*/
+ @Override
public Reference getReference() throws NamingException {
Reference ref = new Reference(getClass().getName(),
SharedPoolDataSourceFactory.class.getName(), null);
@@ -230,6 +234,7 @@ public class SharedPoolDataSource
isRollbackAfterValidation());
}
+ @Override
protected void setupDefaults(Connection con, String username) throws SQLException {
boolean defaultAutoCommit = isDefaultAutoCommit();
if (con.getAutoCommit() != defaultAutoCommit) {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/SharedPoolDataSourceFactory.java Thu May 5 17:19:01 2011
@@ -30,10 +30,12 @@ public class SharedPoolDataSourceFactory
private static final String SHARED_POOL_CLASSNAME =
SharedPoolDataSource.class.getName();
+ @Override
protected boolean isCorrectClass(String className) {
return SHARED_POOL_CLASSNAME.equals(className);
}
+ @Override
protected InstanceKeyDataSource getNewInstance(Reference ref) {
SharedPoolDataSource spds = new SharedPoolDataSource();
RefAddr ra = ref.get("maxActive");
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/UserPassKey.java Thu May 5 17:19:01 2011
@@ -63,6 +63,7 @@ class UserPassKey implements Serializabl
*
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
@@ -86,11 +87,13 @@ class UserPassKey implements Serializabl
/**
* Returns the hash of the username.
*/
+ @Override
public int hashCode() {
return (this.username != null ?
(this.username).hashCode() : 0);
}
+ @Override
public String toString() {
StringBuffer sb = new StringBuffer(50);
sb.append("UserPassKey(");
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/BasicManagedDataSource.java Thu May 5 17:19:01 2011
@@ -125,6 +125,7 @@ public class BasicManagedDataSource exte
this.xaDataSource = xaDataSource;
}
+ @Override
protected ConnectionFactory createConnectionFactory() throws SQLException {
if (transactionManager == null) {
throw new SQLException("Transaction manager must be set before a connection can be created");
@@ -162,6 +163,7 @@ public class BasicManagedDataSource exte
return xaConnectionFactory;
}
+ @Override
protected void createDataSourceInstance() throws SQLException {
PoolingDataSource pds = new ManagedDataSource(connectionPool, transactionRegistry);
pds.setAccessToUnderlyingConnectionAllowed(isAccessToUnderlyingConnectionAllowed());
@@ -177,6 +179,7 @@ public class BasicManagedDataSource exte
* @param abandonedConfig abandoned connection tracking configuration (null if no tracking)
* @throws SQLException if an error occurs creating the PoolableConnectionFactory
*/
+ @Override
protected void createPoolableConnectionFactory(ConnectionFactory driverConnectionFactory,
KeyedObjectPoolFactory statementPoolFactory, AbandonedConfig abandonedConfig) throws SQLException {
PoolableConnectionFactory connectionFactory = null;
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/DataSourceXAConnectionFactory.java Thu May 5 17:19:01 2011
@@ -90,10 +90,12 @@ public class DataSourceXAConnectionFacto
this.password = password;
}
+ @Override
public TransactionRegistry getTransactionRegistry() {
return transactionRegistry;
}
+ @Override
public Connection createConnection() throws SQLException {
// create a new XAConection
XAConnection xaConnection;
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/LocalXAConnectionFactory.java Thu May 5 17:19:01 2011
@@ -53,10 +53,12 @@ public class LocalXAConnectionFactory im
this.connectionFactory = connectionFactory;
}
+ @Override
public TransactionRegistry getTransactionRegistry() {
return transactionRegistry;
}
+ @Override
public Connection createConnection() throws SQLException {
// create a new connection
Connection connection = connectionFactory.createConnection();
@@ -110,6 +112,7 @@ public class LocalXAConnectionFactory im
* @throws XAException if the connection is already enlisted in another transaction, or if auto-commit
* could not be disabled
*/
+ @Override
public synchronized void start(Xid xid, int flag) throws XAException {
if (flag == XAResource.TMNOFLAGS) {
// first time in this transaction
@@ -151,6 +154,7 @@ public class LocalXAConnectionFactory im
* @param flag ignored
* @throws XAException if the connection is already enlisted in another transaction
*/
+ @Override
public synchronized void end(Xid xid, int flag) throws XAException {
if (xid == null) throw new NullPointerException("xid is null");
if (!this.currentXid.equals(xid)) throw new XAException("Invalid Xid: expected " + this.currentXid + ", but was " + xid);
@@ -169,6 +173,7 @@ public class LocalXAConnectionFactory im
* @param xid the id of the transaction branch for this connection
* @return XAResource.XA_RDONLY if the connection.isReadOnly(); XAResource.XA_OK otherwise
*/
+ @Override
public synchronized int prepare(Xid xid) {
// if the connection is read-only, then the resource is read-only
// NOTE: this assumes that the outer proxy throws an exception when application code
@@ -196,6 +201,7 @@ public class LocalXAConnectionFactory im
* @param flag ignored
* @throws XAException if connection.commit() throws a SQLException
*/
+ @Override
public synchronized void commit(Xid xid, boolean flag) throws XAException {
if (xid == null) throw new NullPointerException("xid is null");
if (!this.currentXid.equals(xid)) throw new XAException("Invalid Xid: expected " + this.currentXid + ", but was " + xid);
@@ -227,6 +233,7 @@ public class LocalXAConnectionFactory im
* @param xid the id of the transaction branch for this connection
* @throws XAException if connection.rollback() throws a SQLException
*/
+ @Override
public synchronized void rollback(Xid xid) throws XAException {
if (xid == null) throw new NullPointerException("xid is null");
if (!this.currentXid.equals(xid)) throw new XAException("Invalid Xid: expected " + this.currentXid + ", but was " + xid);
@@ -250,6 +257,7 @@ public class LocalXAConnectionFactory im
* @param xaResource the XAResource to test
* @return true if the specified XAResource == this XAResource; false otherwise
*/
+ @Override
public boolean isSameRM(XAResource xaResource) {
return this == xaResource;
}
@@ -259,6 +267,7 @@ public class LocalXAConnectionFactory im
*
* @param xid the id of the transaction to forget
*/
+ @Override
public synchronized void forget(Xid xid) {
if (xid != null && this.currentXid.equals(xid)) {
this.currentXid = null;
@@ -271,6 +280,7 @@ public class LocalXAConnectionFactory im
* @param flag ignored since recovery is not supported
* @return always a zero length Xid array.
*/
+ @Override
public Xid[] recover(int flag) {
return new Xid[0];
}
@@ -280,6 +290,7 @@ public class LocalXAConnectionFactory im
*
* @return always 0
*/
+ @Override
public int getTransactionTimeout() {
return 0;
}
@@ -290,6 +301,7 @@ public class LocalXAConnectionFactory im
* @param transactionTimeout ignored since we have no way to set a transaction timeout on a JDBC connection
* @return always false
*/
+ @Override
public boolean setTransactionTimeout(int transactionTimeout) {
return false;
}
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedConnection.java Thu May 5 17:19:01 2011
@@ -55,6 +55,7 @@ public class ManagedConnection extends D
updateTransactionStatus();
}
+ @Override
protected void checkOpen() throws SQLException {
super.checkOpen();
updateTransactionStatus();
@@ -138,6 +139,7 @@ public class ManagedConnection extends D
}
}
+ @Override
public void close() throws SQLException {
if (!_closed) {
try {
@@ -157,6 +159,7 @@ public class ManagedConnection extends D
* for transaction completion events.
*/
protected class CompletionListener implements TransactionContextListener {
+ @Override
public void afterCompletion(TransactionContext completedContext, boolean commited) {
if (completedContext == transactionContext) {
transactionComplete();
@@ -201,6 +204,7 @@ public class ManagedConnection extends D
// The following methods can't be used while enlisted in a transaction
//
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
if (transactionContext != null) {
throw new SQLException("Auto-commit can not be set while enrolled in a transaction");
@@ -209,6 +213,7 @@ public class ManagedConnection extends D
}
+ @Override
public void commit() throws SQLException {
if (transactionContext != null) {
throw new SQLException("Commit can not be set while enrolled in a transaction");
@@ -216,6 +221,7 @@ public class ManagedConnection extends D
super.commit();
}
+ @Override
public void rollback() throws SQLException {
if (transactionContext != null) {
throw new SQLException("Commit can not be set while enrolled in a transaction");
@@ -224,6 +230,7 @@ public class ManagedConnection extends D
}
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
if (transactionContext != null) {
throw new SQLException("Read-only can not be set while enrolled in a transaction");
@@ -243,6 +250,7 @@ public class ManagedConnection extends D
return accessToUnderlyingConnectionAllowed;
}
+ @Override
public Connection getDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return getDelegateInternal();
@@ -251,6 +259,7 @@ public class ManagedConnection extends D
}
}
+ @Override
public Connection getInnermostDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return super.getInnermostDelegateInternal();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/ManagedDataSource.java Thu May 5 17:19:01 2011
@@ -70,6 +70,7 @@ public class ManagedDataSource extends P
this.transactionRegistry = transactionRegistry;
}
+ @Override
public Connection getConnection() throws SQLException {
if (_pool == null) throw new IllegalStateException("Pool has not been set");
if (transactionRegistry == null) throw new IllegalStateException("TransactionRegistry has not been set");
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnection.java Thu May 5 17:19:01 2011
@@ -62,6 +62,7 @@ public class PoolableManagedConnection e
/**
* Actually close the underlying connection.
*/
+ @Override
public void reallyClose() throws SQLException {
try {
super.reallyClose();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/PoolableManagedConnectionFactory.java Thu May 5 17:19:01 2011
@@ -99,6 +99,7 @@ public class PoolableManagedConnectionFa
* and sets up a prepared statement pool associated with the PoolableManagedConnection
* if statement pooling is enabled.
*/
+ @Override
synchronized public Object makeObject() throws Exception {
Connection conn = _connFactory.createConnection();
if (conn == null) {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/TransactionContext.java Thu May 5 17:19:01 2011
@@ -105,9 +105,11 @@ public class TransactionContext {
public void addTransactionContextListener(final TransactionContextListener listener) throws SQLException {
try {
getTransaction().registerSynchronization(new Synchronization() {
+ @Override
public void beforeCompletion() {
}
+ @Override
public void afterCompletion(int status) {
listener.afterCompletion(TransactionContext.this, status == Status.STATUS_COMMITTED);
}
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/managed/XAConnectionFactory.java Thu May 5 17:19:01 2011
@@ -53,5 +53,6 @@ public interface XAConnectionFactory ext
* @return a new {@link java.sql.Connection}
* @throws java.sql.SQLException if a database error occurs creating the connection
*/
+ @Override
Connection createConnection() throws SQLException;
}
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl2/JOCLContentHandler.java Thu May 5 17:19:01 2011
@@ -422,6 +422,7 @@ public class JOCLContentHandler extends
//--- Public Methods - DocumentHandler ---------------------------
+ @Override
public void startElement(String uri, String localName, String qname, Attributes attr) throws SAXException {
try {
if(isJoclNamespace(uri,localName,qname)) {
@@ -485,6 +486,7 @@ public class JOCLContentHandler extends
}
}
+ @Override
public void endElement(String uri, String localName, String qname) throws SAXException {
try {
if(isJoclNamespace(uri,localName,qname)) {
@@ -528,6 +530,7 @@ public class JOCLContentHandler extends
}
}
+ @Override
public void setDocumentLocator(Locator locator) {
_locator = locator;
}
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedBasicDataSource.java Thu May 5 17:19:01 2011
@@ -42,6 +42,7 @@ public class TestAbandonedBasicDataSourc
return new TestSuite(TestAbandonedBasicDataSource.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -52,6 +53,7 @@ public class TestAbandonedBasicDataSourc
ds.setRemoveAbandonedTimeout(10000);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
// nothing to do here
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestAbandonedObjectPool.java Thu May 5 17:19:01 2011
@@ -43,6 +43,7 @@ public class TestAbandonedObjectPool ext
return new TestSuite(TestAbandonedObjectPool.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
config = new AbandonedConfig();
@@ -55,6 +56,7 @@ public class TestAbandonedObjectPool ext
pool = new AbandonedObjectPool(new SimpleFactory(), config);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
pool.close();
@@ -114,6 +116,7 @@ public class TestAbandonedObjectPool ext
_borrowed = borrowed;
}
+ @Override
public void run() {
try {
_borrowed.add(pool.borrowObject());
@@ -125,20 +128,25 @@ public class TestAbandonedObjectPool ext
class SimpleFactory implements PoolableObjectFactory {
+ @Override
public Object makeObject() {
return new PooledTestObject(config);
}
+ @Override
public boolean validateObject(Object obj) { return true; }
+ @Override
public void activateObject(Object obj) {
((PooledTestObject)obj).setActive(true);
}
+ @Override
public void passivateObject(Object obj) {
((PooledTestObject)obj).setActive(false);
}
+ @Override
public void destroyObject(Object obj) {
((PooledTestObject)obj).setActive(false);
// while destroying connections, yield control to other threads
@@ -168,6 +176,7 @@ class PooledTestObject extends Abandoned
return active;
}
+ @Override
public int hashCode() {
return _hash;
}
@@ -176,6 +185,7 @@ class PooledTestObject extends Abandoned
_abandoned = b;
}
+ @Override
protected long getLastUsed() {
if (_abandoned) {
// Abandoned object sweep will occur no matter what the value of removeAbandonedTimeout,
@@ -187,6 +197,7 @@ class PooledTestObject extends Abandoned
}
}
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof PooledTestObject)) return false;
return obj.hashCode() == hashCode();
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestBasicDataSource.java Thu May 5 17:19:01 2011
@@ -43,6 +43,7 @@ public class TestBasicDataSource extends
return new TestSuite(TestBasicDataSource.class);
}
+ @Override
protected Connection getConnection() throws Exception {
return ds.getConnection();
}
@@ -50,6 +51,7 @@ public class TestBasicDataSource extends
protected BasicDataSource ds = null;
private static final String CATALOG = "test catalog";
+ @Override
public void setUp() throws Exception {
super.setUp();
ds = createDataSource();
@@ -72,6 +74,7 @@ public class TestBasicDataSource extends
return new BasicDataSource();
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
ds.close();
@@ -196,6 +199,7 @@ public class TestBasicDataSource extends
conn3.close();
}
+ @Override
public void testPooling() throws Exception {
// this also needs access to the underlying connection
ds.setAccessToUnderlyingConnectionAllowed(true);
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestConnectionPool.java Thu May 5 17:19:01 2011
@@ -47,6 +47,7 @@ public abstract class TestConnectionPool
super(testName);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
// Close any connections opened by the test
@@ -577,6 +578,7 @@ public abstract class TestConnectionPool
return _failed;
}
+ @Override
public void run() {
for(int i=0;i<_iter;i++) {
try {
@@ -709,6 +711,7 @@ public abstract class TestConnectionPool
final PoolTest[] pts = new PoolTest[2 * getMaxActive()];
// Catch Exception so we can stop all threads if one fails
ThreadGroup threadGroup = new ThreadGroup("foo") {
+ @Override
public void uncaughtException(Thread t, Throwable e) {
for (int i = 0; i < pts.length; i++) {
pts[i].stop();
@@ -856,6 +859,7 @@ public abstract class TestConnectionPool
thread.start();
}
+ @Override
public void run() {
started = timeStamp();
try {
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingCallableStatement.java Thu May 5 17:19:01 2011
@@ -41,6 +41,7 @@ public class TestDelegatingCallableState
private DelegatingCallableStatement stmt = null;
private CallableStatement delegateStmt = null;
+ @Override
public void setUp() throws Exception {
delegateConn = new TesterConnection("test", "test");
conn = new DelegatingConnection(delegateConn);
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingConnection.java Thu May 5 17:19:01 2011
@@ -43,6 +43,7 @@ public class TestDelegatingConnection ex
private Connection delegateConn = null;
private Connection delegateConn2 = null;
+ @Override
public void setUp() throws Exception {
delegateConn = new TesterConnection("test", "test");
delegateConn2 = new TesterConnection("test", "test");
@@ -146,6 +147,7 @@ public class TestDelegatingConnection ex
public RTEGeneratingConnection() {
super("","");
}
+ @Override
public String toString() {
throw new RuntimeException("bang!");
}
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingDatabaseMetaData.java Thu May 5 17:19:01 2011
@@ -43,6 +43,7 @@ public class TestDelegatingDatabaseMetaD
private DelegatingDatabaseMetaData meta = null;
private DatabaseMetaData delegateMeta = null;
+ @Override
public void setUp() throws Exception {
delegateConn = new TesterConnection("test", "test");
delegateMeta = delegateConn.getMetaData();
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingPreparedStatement.java Thu May 5 17:19:01 2011
@@ -43,6 +43,7 @@ public class TestDelegatingPreparedState
private DelegatingPreparedStatement stmt = null;
private PreparedStatement delegateStmt = null;
+ @Override
public void setUp() throws Exception {
delegateConn = new TesterConnection("test", "test");
conn = new DelegatingConnection(delegateConn);
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDelegatingStatement.java Thu May 5 17:19:01 2011
@@ -44,6 +44,7 @@ public class TestDelegatingStatement ext
private DelegatingStatement stmt = null;
private Statement delegateStmt = null;
+ @Override
public void setUp() throws Exception {
delegateConn = new TesterConnection("test", "test");
delegateStmt = new TesterStatement(delegateConn);
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestDriverManagerConnectionFactory.java Thu May 5 17:19:01 2011
@@ -88,6 +88,7 @@ public class TestDriverManagerConnection
this.ds = ds;
}
+ @Override
public void run() {
Connection conn = null;
try {
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJOCLed.java Thu May 5 17:19:01 2011
@@ -42,18 +42,21 @@ public class TestJOCLed extends TestConn
return new TestSuite(TestJOCLed.class);
}
+ @Override
protected Connection getConnection() throws Exception {
return DriverManager.getConnection("jdbc:apache:commons:dbcp:/testpool");
}
private PoolingDriver driver = null;
+ @Override
public void setUp() throws Exception {
super.setUp();
driver = new PoolingDriver();
PoolingDriver.setAccessToUnderlyingConnectionAllowed(true);
}
+ @Override
public void tearDown() throws Exception {
driver.closePool("testpool");
DriverManager.deregisterDriver(driver);
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestJndi.java Thu May 5 17:19:01 2011
@@ -93,11 +93,13 @@ public class TestJndi extends TestCase {
checkBind(dataSource);
}
+ @Override
public void setUp() throws Exception {
context = getInitialContext();
context.createSubcontext(JNDI_SUBCONTEXT);
}
+ @Override
public void tearDown() throws Exception {
context.unbind(JNDI_PATH);
context.destroySubcontext(JNDI_SUBCONTEXT);
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestManual.java Thu May 5 17:19:01 2011
@@ -48,12 +48,14 @@ public class TestManual extends TestConn
return new TestSuite(TestManual.class);
}
+ @Override
protected Connection getConnection() throws Exception {
return DriverManager.getConnection("jdbc:apache:commons:dbcp:test");
}
private PoolingDriver driver = null;
+ @Override
public void setUp() throws Exception {
super.setUp();
GenericObjectPool pool = new GenericObjectPool(null, getMaxActive(), GenericObjectPool.WHEN_EXHAUSTED_BLOCK, getMaxWait(), 10, true, true, 10000L, 5, 5000L, true);
@@ -66,6 +68,7 @@ public class TestManual extends TestConn
PoolingDriver.setAccessToUnderlyingConnectionAllowed(true);
}
+ @Override
public void tearDown() throws Exception {
driver.closePool("test");
super.tearDown();
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java Thu May 5 17:19:01 2011
@@ -40,6 +40,7 @@ public class TestPStmtPoolingBasicDataSo
return new TestSuite(TestPStmtPoolingBasicDataSource.class);
}
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -48,6 +49,7 @@ public class TestPStmtPoolingBasicDataSo
ds.setMaxOpenPreparedStatements(2);
}
+ @Override
public void tearDown() throws Exception {
super.tearDown();
// nothing to do here
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolableConnection.java Thu May 5 17:19:01 2011
@@ -42,6 +42,7 @@ public class TestPoolableConnection exte
private ObjectPool pool = null;
+ @Override
public void setUp() throws Exception {
pool = new GenericObjectPool();
PoolableConnectionFactory factory =
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestPoolingDataSource.java Thu May 5 17:19:01 2011
@@ -40,6 +40,7 @@ public class TestPoolingDataSource exten
return new TestSuite(TestPoolingDataSource.class);
}
+ @Override
protected Connection getConnection() throws Exception {
return ds.getConnection();
}
@@ -47,6 +48,7 @@ public class TestPoolingDataSource exten
protected PoolingDataSource ds = null;
private GenericObjectPool pool = null;
+ @Override
public void setUp() throws Exception {
super.setUp();
pool = new GenericObjectPool();
@@ -65,6 +67,7 @@ public class TestPoolingDataSource exten
ds.setAccessToUnderlyingConnectionAllowed(true);
}
+ @Override
public void tearDown() throws Exception {
pool.close();
super.tearDown();
@@ -163,6 +166,7 @@ public class TestPoolingDataSource exten
super(connFactory, pool, null, null, true, true);
}
+ @Override
synchronized public Object makeObject() throws Exception {
return _connFactory.createConnection();
}
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java Thu May 5 17:19:01 2011
@@ -59,44 +59,55 @@ public class TesterCallableStatement ext
super(conn, sql, resultSetType, resultSetConcurrency);
}
+ @Override
public void registerOutParameter(int parameterIndex, int sqlType) throws SQLException {
}
+ @Override
public void registerOutParameter(int parameterIndex, int sqlType, int scale) throws SQLException {
}
+ @Override
public boolean wasNull() throws SQLException {
return false;
}
+ @Override
public String getString(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public boolean getBoolean(int parameterIndex) throws SQLException {
return false;
}
+ @Override
public byte getByte(int parameterIndex) throws SQLException {
return 0;
}
+ @Override
public short getShort(int parameterIndex) throws SQLException {
return 0;
}
+ @Override
public int getInt(int parameterIndex) throws SQLException {
return 0;
}
+ @Override
public long getLong(int parameterIndex) throws SQLException {
return 0;
}
+ @Override
public float getFloat(int parameterIndex) throws SQLException {
return 0;
}
+ @Override
public double getDouble(int parameterIndex) throws SQLException {
return 0;
}
@@ -104,310 +115,396 @@ public class TesterCallableStatement ext
/**
* @deprecated
*/
+ @Override
public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException {
return null;
}
+ @Override
public byte[] getBytes(int parameterIndex) throws SQLException {
return new byte[0];
}
+ @Override
public Date getDate(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public Time getTime(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public Timestamp getTimestamp(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public Object getObject(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public BigDecimal getBigDecimal(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public Object getObject(int i, Map map) throws SQLException {
return null;
}
+ @Override
public Ref getRef(int i) throws SQLException {
return null;
}
+ @Override
public Blob getBlob(int i) throws SQLException {
return null;
}
+ @Override
public Clob getClob(int i) throws SQLException {
return null;
}
+ @Override
public Array getArray(int i) throws SQLException {
return null;
}
+ @Override
public Date getDate(int parameterIndex, Calendar cal) throws SQLException {
return null;
}
+ @Override
public Time getTime(int parameterIndex, Calendar cal) throws SQLException {
return null;
}
+ @Override
public Timestamp getTimestamp(int parameterIndex, Calendar cal) throws SQLException {
return null;
}
+ @Override
public void registerOutParameter(int paramIndex, int sqlType, String typeName) throws SQLException {
}
+ @Override
public void registerOutParameter(String parameterName, int sqlType) throws SQLException {
}
+ @Override
public void registerOutParameter(String parameterName, int sqlType, int scale) throws SQLException {
}
+ @Override
public void registerOutParameter(String parameterName, int sqlType, String typeName) throws SQLException {
}
+ @Override
public URL getURL(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public void setURL(String parameterName, URL val) throws SQLException {
}
+ @Override
public void setNull(String parameterName, int sqlType) throws SQLException {
}
+ @Override
public void setBoolean(String parameterName, boolean x) throws SQLException {
}
+ @Override
public void setByte(String parameterName, byte x) throws SQLException {
}
+ @Override
public void setShort(String parameterName, short x) throws SQLException {
}
+ @Override
public void setInt(String parameterName, int x) throws SQLException {
}
+ @Override
public void setLong(String parameterName, long x) throws SQLException {
}
+ @Override
public void setFloat(String parameterName, float x) throws SQLException {
}
+ @Override
public void setDouble(String parameterName, double x) throws SQLException {
}
+ @Override
public void setBigDecimal(String parameterName, BigDecimal x) throws SQLException {
}
+ @Override
public void setString(String parameterName, String x) throws SQLException {
}
+ @Override
public void setBytes(String parameterName, byte x[]) throws SQLException {
}
+ @Override
public void setDate(String parameterName, Date x) throws SQLException {
}
+ @Override
public void setTime(String parameterName, Time x) throws SQLException {
}
+ @Override
public void setTimestamp(String parameterName, Timestamp x) throws SQLException {
}
+ @Override
public void setAsciiStream(String parameterName, InputStream x, int length) throws SQLException {
}
+ @Override
public void setBinaryStream(String parameterName, InputStream x, int length) throws SQLException {
}
+ @Override
public void setObject(String parameterName, Object x, int targetSqlType, int scale) throws SQLException {
}
+ @Override
public void setObject(String parameterName, Object x, int targetSqlType) throws SQLException {
}
+ @Override
public void setObject(String parameterName, Object x) throws SQLException {
}
+ @Override
public void setCharacterStream(String parameterName, Reader reader, int length) throws SQLException {
}
+ @Override
public void setDate(String parameterName, Date x, Calendar cal) throws SQLException {
}
+ @Override
public void setTime(String parameterName, Time x, Calendar cal) throws SQLException {
}
+ @Override
public void setTimestamp(String parameterName, Timestamp x, Calendar cal) throws SQLException {
}
+ @Override
public void setNull(String parameterName, int sqlType, String typeName) throws SQLException {
}
+ @Override
public String getString(String parameterName) throws SQLException {
return null;
}
+ @Override
public boolean getBoolean(String parameterName) throws SQLException {
return false;
}
+ @Override
public byte getByte(String parameterName) throws SQLException {
return 0;
}
+ @Override
public short getShort(String parameterName) throws SQLException {
return 0;
}
+ @Override
public int getInt(String parameterName) throws SQLException {
return 0;
}
+ @Override
public long getLong(String parameterName) throws SQLException {
return 0;
}
+ @Override
public float getFloat(String parameterName) throws SQLException {
return 0;
}
+ @Override
public double getDouble(String parameterName) throws SQLException {
return 0;
}
+ @Override
public byte[] getBytes(String parameterName) throws SQLException {
return new byte[0];
}
+ @Override
public Date getDate(String parameterName) throws SQLException {
return null;
}
+ @Override
public Time getTime(String parameterName) throws SQLException {
return null;
}
+ @Override
public Timestamp getTimestamp(String parameterName) throws SQLException {
return null;
}
+ @Override
public Object getObject(String parameterName) throws SQLException {
return null;
}
+ @Override
public BigDecimal getBigDecimal(String parameterName) throws SQLException {
return null;
}
+ @Override
public Object getObject(String parameterName, Map map) throws SQLException {
return null;
}
+ @Override
public Ref getRef(String parameterName) throws SQLException {
return null;
}
+ @Override
public Blob getBlob(String parameterName) throws SQLException {
return null;
}
+ @Override
public Clob getClob(String parameterName) throws SQLException {
return null;
}
+ @Override
public Array getArray(String parameterName) throws SQLException {
return null;
}
+ @Override
public Date getDate(String parameterName, Calendar cal) throws SQLException {
return null;
}
+ @Override
public Time getTime(String parameterName, Calendar cal) throws SQLException {
return null;
}
+ @Override
public Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLException {
return null;
}
+ @Override
public URL getURL(String parameterName) throws SQLException {
return null;
}
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public RowId getRowId(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public RowId getRowId(String parameterName) throws SQLException {
return null;
}
+ @Override
public void setRowId(String parameterName, RowId value) throws SQLException {
}
+ @Override
public void setNString(String parameterName, String value) throws SQLException {
}
+ @Override
public void setNCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
}
+ @Override
public void setNClob(String parameterName, NClob value) throws SQLException {
}
+ @Override
public void setClob(String parameterName, Reader reader, long length) throws SQLException {
}
+ @Override
public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
}
+ @Override
public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
}
+ @Override
public NClob getNClob(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public NClob getNClob(String parameterName) throws SQLException {
return null;
}
+ @Override
public void setSQLXML(String parameterName, SQLXML value) throws SQLException {
}
+ @Override
public SQLXML getSQLXML(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public SQLXML getSQLXML(String parameterName) throws SQLException {
return null;
}
+ @Override
public String getNString(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public String getNString(String parameterName) throws SQLException {
return null;
}
+ @Override
public Reader getNCharacterStream(int parameterIndex) throws SQLException {
return null;
}
+ @Override
public Reader getNCharacterStream(String parameterName) throws SQLException {
return null;
}
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterConnection.java Thu May 5 17:19:01 2011
@@ -69,16 +69,19 @@ public class TesterConnection implements
this.warnings = warning;
}
+ @Override
public void clearWarnings() throws SQLException {
checkOpen();
warnings = null;
}
+ @Override
public void close() throws SQLException {
checkFailure();
_open = false;
}
+ @Override
public void commit() throws SQLException {
checkOpen();
if (isReadOnly()) {
@@ -86,61 +89,73 @@ public class TesterConnection implements
}
}
+ @Override
public Statement createStatement() throws SQLException {
checkOpen();
return new TesterStatement(this);
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new TesterStatement(this);
}
+ @Override
public boolean getAutoCommit() throws SQLException {
checkOpen();
return _autoCommit;
}
+ @Override
public String getCatalog() throws SQLException {
checkOpen();
return _catalog;
}
+ @Override
public DatabaseMetaData getMetaData() throws SQLException {
checkOpen();
return _metaData;
}
+ @Override
public int getTransactionIsolation() throws SQLException {
checkOpen();
return _transactionIsolation;
}
+ @Override
public Map getTypeMap() throws SQLException {
checkOpen();
return _typeMap;
}
+ @Override
public SQLWarning getWarnings() throws SQLException {
checkOpen();
return warnings;
}
+ @Override
public boolean isClosed() throws SQLException {
checkFailure();
return !_open;
}
+ @Override
public boolean isReadOnly() throws SQLException {
checkOpen();
return _readOnly;
}
+ @Override
public String nativeSQL(String sql) throws SQLException {
checkOpen();
return sql;
}
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
checkOpen();
if ("warning".equals(sql)) {
@@ -149,11 +164,13 @@ public class TesterConnection implements
return new TesterCallableStatement(this);
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new TesterCallableStatement(this);
}
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
checkOpen();
if("null".equals(sql)) {
@@ -166,11 +183,13 @@ public class TesterConnection implements
return new TesterPreparedStatement(this, sql);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new TesterPreparedStatement(this, sql, resultSetType, resultSetConcurrency);
}
+ @Override
public void rollback() throws SQLException {
checkOpen();
if (isReadOnly()) {
@@ -178,26 +197,31 @@ public class TesterConnection implements
}
}
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
checkOpen();
_autoCommit = autoCommit;
}
+ @Override
public void setCatalog(String catalog) throws SQLException {
checkOpen();
_catalog = catalog;
}
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
checkOpen();
_readOnly = readOnly;
}
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
checkOpen();
_transactionIsolation = level;
}
+ @Override
public void setTypeMap(Map map) throws SQLException {
checkOpen();
_typeMap = map;
@@ -220,30 +244,37 @@ public class TesterConnection implements
this.failure = failure;
}
+ @Override
public int getHoldability() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public void setHoldability(int holdability) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public java.sql.Savepoint setSavepoint() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public java.sql.Savepoint setSavepoint(String name) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public void rollback(java.sql.Savepoint savepoint) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public void releaseSavepoint(java.sql.Savepoint savepoint) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public Statement createStatement(int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
@@ -251,6 +282,7 @@ public class TesterConnection implements
return createStatement();
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
@@ -258,6 +290,7 @@ public class TesterConnection implements
return prepareStatement(sql);
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
@@ -265,16 +298,19 @@ public class TesterConnection implements
return prepareCall(sql);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
throws SQLException {
return prepareStatement(sql);
}
+ @Override
public PreparedStatement prepareStatement(String sql, int columnIndexes[])
throws SQLException {
return prepareStatement(sql);
}
+ @Override
public PreparedStatement prepareStatement(String sql, String columnNames[])
throws SQLException {
return prepareStatement(sql);
@@ -282,54 +318,67 @@ public class TesterConnection implements
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public Blob createBlob() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public Clob createClob() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public NClob createNClob() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public SQLXML createSQLXML() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public boolean isValid(int timeout) throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public void setClientInfo(String name, String value) throws SQLClientInfoException {
throw new SQLClientInfoException();
}
+ @Override
public void setClientInfo(Properties properties) throws SQLClientInfoException {
throw new SQLClientInfoException();
}
+ @Override
public Properties getClientInfo() throws SQLException {
throw new SQLException("Not implemented.");
}
+ @Override
public String getClientInfo(String name) throws SQLException {
throw new SQLException("Not implemented.");
}
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java Thu May 5 17:19:01 2011
@@ -31,423 +31,523 @@ import java.sql.SQLException;
*/
public class TesterDatabaseMetaData implements DatabaseMetaData {
+ @Override
public boolean allProceduresAreCallable() throws SQLException {
return false;
}
+ @Override
public boolean allTablesAreSelectable() throws SQLException {
return false;
}
+ @Override
public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
return false;
}
+ @Override
public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
return false;
}
+ @Override
public boolean deletesAreDetected(int type) throws SQLException {
return false;
}
+ @Override
public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
return false;
}
+ @Override
public ResultSet getAttributes(String catalog, String schemaPattern,
String typeNamePattern, String attributeNamePattern)
throws SQLException {
return null;
}
+ @Override
public ResultSet getBestRowIdentifier(String catalog, String schema,
String table, int scope, boolean nullable) throws SQLException {
return null;
}
+ @Override
public String getCatalogSeparator() throws SQLException {
return null;
}
+ @Override
public String getCatalogTerm() throws SQLException {
return null;
}
+ @Override
public ResultSet getCatalogs() throws SQLException {
return null;
}
+ @Override
public ResultSet getColumnPrivileges(String catalog, String schema,
String table, String columnNamePattern) throws SQLException {
return null;
}
+ @Override
public ResultSet getColumns(String catalog, String schemaPattern,
String tableNamePattern, String columnNamePattern)
throws SQLException {
return null;
}
+ @Override
public Connection getConnection() throws SQLException {
return null;
}
+ @Override
public ResultSet getCrossReference(String parentCatalog,
String parentSchema, String parentTable, String foreignCatalog,
String foreignSchema, String foreignTable) throws SQLException {
return null;
}
+ @Override
public int getDatabaseMajorVersion() throws SQLException {
return 0;
}
+ @Override
public int getDatabaseMinorVersion() throws SQLException {
return 0;
}
+ @Override
public String getDatabaseProductName() throws SQLException {
return null;
}
+ @Override
public String getDatabaseProductVersion() throws SQLException {
return null;
}
+ @Override
public int getDefaultTransactionIsolation() throws SQLException {
return 0;
}
+ @Override
public int getDriverMajorVersion() {
return 0;
}
+ @Override
public int getDriverMinorVersion() {
return 0;
}
+ @Override
public String getDriverName() throws SQLException {
return null;
}
+ @Override
public String getDriverVersion() throws SQLException {
return null;
}
+ @Override
public ResultSet getExportedKeys(String catalog, String schema, String table)
throws SQLException {
return null;
}
+ @Override
public String getExtraNameCharacters() throws SQLException {
return null;
}
+ @Override
public String getIdentifierQuoteString() throws SQLException {
return null;
}
+ @Override
public ResultSet getImportedKeys(String catalog, String schema, String table)
throws SQLException {
return null;
}
+ @Override
public ResultSet getIndexInfo(String catalog, String schema, String table,
boolean unique, boolean approximate) throws SQLException {
return null;
}
+ @Override
public int getJDBCMajorVersion() throws SQLException {
return 0;
}
+ @Override
public int getJDBCMinorVersion() throws SQLException {
return 0;
}
+ @Override
public int getMaxBinaryLiteralLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxCatalogNameLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxCharLiteralLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxColumnNameLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxColumnsInGroupBy() throws SQLException {
return 0;
}
+ @Override
public int getMaxColumnsInIndex() throws SQLException {
return 0;
}
+ @Override
public int getMaxColumnsInOrderBy() throws SQLException {
return 0;
}
+ @Override
public int getMaxColumnsInSelect() throws SQLException {
return 0;
}
+ @Override
public int getMaxColumnsInTable() throws SQLException {
return 0;
}
+ @Override
public int getMaxConnections() throws SQLException {
return 0;
}
+ @Override
public int getMaxCursorNameLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxIndexLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxProcedureNameLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxRowSize() throws SQLException {
return 0;
}
+ @Override
public int getMaxSchemaNameLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxStatementLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxStatements() throws SQLException {
return 0;
}
+ @Override
public int getMaxTableNameLength() throws SQLException {
return 0;
}
+ @Override
public int getMaxTablesInSelect() throws SQLException {
return 0;
}
+ @Override
public int getMaxUserNameLength() throws SQLException {
return 0;
}
+ @Override
public String getNumericFunctions() throws SQLException {
return null;
}
+ @Override
public ResultSet getPrimaryKeys(String catalog, String schema, String table)
throws SQLException {
return null;
}
+ @Override
public ResultSet getProcedureColumns(String catalog, String schemaPattern,
String procedureNamePattern, String columnNamePattern)
throws SQLException {
return null;
}
+ @Override
public String getProcedureTerm() throws SQLException {
return null;
}
+ @Override
public ResultSet getProcedures(String catalog, String schemaPattern,
String procedureNamePattern) throws SQLException {
return null;
}
+ @Override
public int getResultSetHoldability() throws SQLException {
return 0;
}
+ @Override
public String getSQLKeywords() throws SQLException {
return null;
}
+ @Override
public int getSQLStateType() throws SQLException {
return 0;
}
+ @Override
public String getSchemaTerm() throws SQLException {
return null;
}
+ @Override
public ResultSet getSchemas() throws SQLException {
return new TesterResultSet(null);
}
+ @Override
public String getSearchStringEscape() throws SQLException {
return null;
}
+ @Override
public String getStringFunctions() throws SQLException {
return null;
}
+ @Override
public ResultSet getSuperTables(String catalog, String schemaPattern,
String tableNamePattern) throws SQLException {
return null;
}
+ @Override
public ResultSet getSuperTypes(String catalog, String schemaPattern,
String typeNamePattern) throws SQLException {
return null;
}
+ @Override
public String getSystemFunctions() throws SQLException {
return null;
}
+ @Override
public ResultSet getTablePrivileges(String catalog, String schemaPattern,
String tableNamePattern) throws SQLException {
return null;
}
+ @Override
public ResultSet getTableTypes() throws SQLException {
return null;
}
+ @Override
public ResultSet getTables(String catalog, String schemaPattern,
String tableNamePattern, String[] types) throws SQLException {
return null;
}
+ @Override
public String getTimeDateFunctions() throws SQLException {
return null;
}
+ @Override
public ResultSet getTypeInfo() throws SQLException {
return null;
}
+ @Override
public ResultSet getUDTs(String catalog, String schemaPattern,
String typeNamePattern, int[] types) throws SQLException {
return null;
}
+ @Override
public String getURL() throws SQLException {
return null;
}
+ @Override
public String getUserName() throws SQLException {
return null;
}
+ @Override
public ResultSet getVersionColumns(String catalog, String schema,
String table) throws SQLException {
return null;
}
+ @Override
public boolean insertsAreDetected(int type) throws SQLException {
return false;
}
+ @Override
public boolean isCatalogAtStart() throws SQLException {
return false;
}
+ @Override
public boolean isReadOnly() throws SQLException {
return false;
}
+ @Override
public boolean locatorsUpdateCopy() throws SQLException {
return false;
}
+ @Override
public boolean nullPlusNonNullIsNull() throws SQLException {
return false;
}
+ @Override
public boolean nullsAreSortedAtEnd() throws SQLException {
return false;
}
+ @Override
public boolean nullsAreSortedAtStart() throws SQLException {
return false;
}
+ @Override
public boolean nullsAreSortedHigh() throws SQLException {
return false;
}
+ @Override
public boolean nullsAreSortedLow() throws SQLException {
return false;
}
+ @Override
public boolean othersDeletesAreVisible(int type) throws SQLException {
return false;
}
+ @Override
public boolean othersInsertsAreVisible(int type) throws SQLException {
return false;
}
+ @Override
public boolean othersUpdatesAreVisible(int type) throws SQLException {
return false;
}
+ @Override
public boolean ownDeletesAreVisible(int type) throws SQLException {
return false;
}
+ @Override
public boolean ownInsertsAreVisible(int type) throws SQLException {
return false;
}
+ @Override
public boolean ownUpdatesAreVisible(int type) throws SQLException {
return false;
}
+ @Override
public boolean storesLowerCaseIdentifiers() throws SQLException {
return false;
}
+ @Override
public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
return false;
}
+ @Override
public boolean storesMixedCaseIdentifiers() throws SQLException {
return false;
}
+ @Override
public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
return false;
}
+ @Override
public boolean storesUpperCaseIdentifiers() throws SQLException {
return false;
}
+ @Override
public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
return false;
}
+ @Override
public boolean supportsANSI92EntryLevelSQL() throws SQLException {
return false;
}
+ @Override
public boolean supportsANSI92FullSQL() throws SQLException {
return false;
}
+ @Override
public boolean supportsANSI92IntermediateSQL() throws SQLException {
return false;
}
+ @Override
public boolean supportsAlterTableWithAddColumn() throws SQLException {
return false;
}
Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDriver.java Thu May 5 17:19:01 2011
@@ -63,6 +63,7 @@ public class TesterDriver implements Dri
}
}
+ @Override
public boolean acceptsURL(String url) throws SQLException {
return CONNECT_STRING.startsWith(url);
}
@@ -84,6 +85,7 @@ public class TesterDriver implements Dri
}
}
+ @Override
public Connection connect(String url, Properties info) throws SQLException {
//return (acceptsURL(url) ? new TesterConnection() : null);
Connection conn = null;
@@ -103,18 +105,22 @@ public class TesterDriver implements Dri
return conn;
}
+ @Override
public int getMajorVersion() {
return MAJOR_VERSION;
}
+ @Override
public int getMinorVersion() {
return MINOR_VERSION;
}
+ @Override
public boolean jdbcCompliant() {
return true;
}
+ @Override
public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) {
return new DriverPropertyInfo[0];
}