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 [2/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/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java Thu May 5 17:19:01 2011
@@ -117,6 +117,7 @@ public class DelegatingResultSet extends
return _res;
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) return true;
ResultSet delegate = getInnermostDelegate();
@@ -132,6 +133,7 @@ public class DelegatingResultSet extends
}
}
+ @Override
public int hashCode() {
Object obj = getInnermostDelegate();
if (obj == null) {
@@ -166,6 +168,7 @@ public class DelegatingResultSet extends
return r;
}
+ @Override
public Statement getStatement() throws SQLException {
return _stmt;
}
@@ -175,6 +178,7 @@ public class DelegatingResultSet extends
* result set from being traced then calls close on
* the original ResultSet.
*/
+ @Override
public void close() throws SQLException {
try {
if(_stmt != null) {
@@ -204,283 +208,375 @@ public class DelegatingResultSet extends
}
}
+ @Override
public boolean next() throws SQLException
{ try { return _res.next(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean wasNull() throws SQLException
{ try { return _res.wasNull(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public String getString(int columnIndex) throws SQLException
{ try { return _res.getString(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public boolean getBoolean(int columnIndex) throws SQLException
{ try { return _res.getBoolean(columnIndex); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public byte getByte(int columnIndex) throws SQLException
{ try { return _res.getByte(columnIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public short getShort(int columnIndex) throws SQLException
{ try { return _res.getShort(columnIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public int getInt(int columnIndex) throws SQLException
{ try { return _res.getInt(columnIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public long getLong(int columnIndex) throws SQLException
{ try { return _res.getLong(columnIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public float getFloat(int columnIndex) throws SQLException
{ try { return _res.getFloat(columnIndex); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public double getDouble(int columnIndex) throws SQLException
{ try { return _res.getDouble(columnIndex); } catch (SQLException e) { handleException(e); return 0; } }
/** @deprecated */
+ @Override
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException
{ try { return _res.getBigDecimal(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public byte[] getBytes(int columnIndex) throws SQLException
{ try { return _res.getBytes(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Date getDate(int columnIndex) throws SQLException
{ try { return _res.getDate(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Time getTime(int columnIndex) throws SQLException
{ try { return _res.getTime(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Timestamp getTimestamp(int columnIndex) throws SQLException
{ try { return _res.getTimestamp(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public InputStream getAsciiStream(int columnIndex) throws SQLException
{ try { return _res.getAsciiStream(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
/** @deprecated */
+ @Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException
{ try { return _res.getUnicodeStream(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public InputStream getBinaryStream(int columnIndex) throws SQLException
{ try { return _res.getBinaryStream(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public String getString(String columnName) throws SQLException
{ try { return _res.getString(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public boolean getBoolean(String columnName) throws SQLException
{ try { return _res.getBoolean(columnName); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public byte getByte(String columnName) throws SQLException
{ try { return _res.getByte(columnName); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public short getShort(String columnName) throws SQLException
{ try { return _res.getShort(columnName); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public int getInt(String columnName) throws SQLException
{ try { return _res.getInt(columnName); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public long getLong(String columnName) throws SQLException
{ try { return _res.getLong(columnName); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public float getFloat(String columnName) throws SQLException
{ try { return _res.getFloat(columnName); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public double getDouble(String columnName) throws SQLException
{ try { return _res.getDouble(columnName); } catch (SQLException e) { handleException(e); return 0; } }
/** @deprecated */
+ @Override
public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException
{ try { return _res.getBigDecimal(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public byte[] getBytes(String columnName) throws SQLException
{ try { return _res.getBytes(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Date getDate(String columnName) throws SQLException
{ try { return _res.getDate(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Time getTime(String columnName) throws SQLException
{ try { return _res.getTime(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Timestamp getTimestamp(String columnName) throws SQLException
{ try { return _res.getTimestamp(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public InputStream getAsciiStream(String columnName) throws SQLException
{ try { return _res.getAsciiStream(columnName); } catch (SQLException e) { handleException(e); return null; } }
/** @deprecated */
+ @Override
public InputStream getUnicodeStream(String columnName) throws SQLException
{ try { return _res.getUnicodeStream(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public InputStream getBinaryStream(String columnName) throws SQLException
{ try { return _res.getBinaryStream(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public SQLWarning getWarnings() throws SQLException
{ try { return _res.getWarnings(); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public void clearWarnings() throws SQLException
{ try { _res.clearWarnings(); } catch (SQLException e) { handleException(e); } }
+ @Override
public String getCursorName() throws SQLException
{ try { return _res.getCursorName(); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public ResultSetMetaData getMetaData() throws SQLException
{ try { return _res.getMetaData(); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Object getObject(int columnIndex) throws SQLException
{ try { return _res.getObject(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Object getObject(String columnName) throws SQLException
{ try { return _res.getObject(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public int findColumn(String columnName) throws SQLException
{ try { return _res.findColumn(columnName); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public Reader getCharacterStream(int columnIndex) throws SQLException
{ try { return _res.getCharacterStream(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public Reader getCharacterStream(String columnName) throws SQLException
{ try { return _res.getCharacterStream(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public BigDecimal getBigDecimal(int columnIndex) throws SQLException
{ try { return _res.getBigDecimal(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public BigDecimal getBigDecimal(String columnName) throws SQLException
{ try { return _res.getBigDecimal(columnName); } catch (SQLException e) { handleException(e); return null; } }
+ @Override
public boolean isBeforeFirst() throws SQLException
{ try { return _res.isBeforeFirst(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean isAfterLast() throws SQLException
{ try { return _res.isAfterLast(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean isFirst() throws SQLException
{ try { return _res.isFirst(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean isLast() throws SQLException
{ try { return _res.isLast(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public void beforeFirst() throws SQLException
{ try { _res.beforeFirst(); } catch (SQLException e) { handleException(e); } }
+ @Override
public void afterLast() throws SQLException
{ try { _res.afterLast(); } catch (SQLException e) { handleException(e); } }
+ @Override
public boolean first() throws SQLException
{ try { return _res.first(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean last() throws SQLException
{ try { return _res.last(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public int getRow() throws SQLException
{ try { return _res.getRow(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public boolean absolute(int row) throws SQLException
{ try { return _res.absolute(row); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean relative(int rows) throws SQLException
{ try { return _res.relative(rows); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean previous() throws SQLException
{ try { return _res.previous(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public void setFetchDirection(int direction) throws SQLException
{ try { _res.setFetchDirection(direction); } catch (SQLException e) { handleException(e); } }
+ @Override
public int getFetchDirection() throws SQLException
{ try { return _res.getFetchDirection(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public void setFetchSize(int rows) throws SQLException
{ try { _res.setFetchSize(rows); } catch (SQLException e) { handleException(e); } }
+ @Override
public int getFetchSize() throws SQLException
{ try { return _res.getFetchSize(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public int getType() throws SQLException
{ try { return _res.getType(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public int getConcurrency() throws SQLException
{ try { return _res.getConcurrency(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public boolean rowUpdated() throws SQLException
{ try { return _res.rowUpdated(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean rowInserted() throws SQLException
{ try { return _res.rowInserted(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public boolean rowDeleted() throws SQLException
{ try { return _res.rowDeleted(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public void updateNull(int columnIndex) throws SQLException
{ try { _res.updateNull(columnIndex); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateBoolean(int columnIndex, boolean x) throws SQLException
{ try { _res.updateBoolean(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateByte(int columnIndex, byte x) throws SQLException
{ try { _res.updateByte(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateShort(int columnIndex, short x) throws SQLException
{ try { _res.updateShort(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateInt(int columnIndex, int x) throws SQLException
{ try { _res.updateInt(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateLong(int columnIndex, long x) throws SQLException
{ try { _res.updateLong(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateFloat(int columnIndex, float x) throws SQLException
{ try { _res.updateFloat(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateDouble(int columnIndex, double x) throws SQLException
{ try { _res.updateDouble(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException
{ try { _res.updateBigDecimal(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateString(int columnIndex, String x) throws SQLException
{ try { _res.updateString(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateBytes(int columnIndex, byte[] x) throws SQLException
{ try { _res.updateBytes(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateDate(int columnIndex, Date x) throws SQLException
{ try { _res.updateDate(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateTime(int columnIndex, Time x) throws SQLException
{ try { _res.updateTime(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException
{ try { _res.updateTimestamp(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException
{ try { _res.updateAsciiStream(columnIndex, x, length); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException
{ try { _res.updateBinaryStream(columnIndex, x, length); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException
{ try { _res.updateCharacterStream(columnIndex, x, length); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateObject(int columnIndex, Object x, int scale) throws SQLException
{ try { _res.updateObject(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateObject(int columnIndex, Object x) throws SQLException
{ try { _res.updateObject(columnIndex, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateNull(String columnName) throws SQLException
{ try { _res.updateNull(columnName); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateBoolean(String columnName, boolean x) throws SQLException
{ try { _res.updateBoolean(columnName, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateByte(String columnName, byte x) throws SQLException
{ try { _res.updateByte(columnName, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateShort(String columnName, short x) throws SQLException
{ try { _res.updateShort(columnName, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateInt(String columnName, int x) throws SQLException
{ try { _res.updateInt(columnName, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateLong(String columnName, long x) throws SQLException
{ try { _res.updateLong(columnName, x); } catch (SQLException e) { handleException(e); } }
+ @Override
public void updateFloat(String columnName, float x) throws SQLException
{ try { _res.updateFloat(columnName, x); } catch (SQLException e) { handleException(e); } }
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingStatement.java Thu May 5 17:19:01 2011
@@ -82,6 +82,7 @@ public class DelegatingStatement extends
* the Statement returned by {@link #getInnermostDelegate()}.</p>
*
*/
+ @Override
public boolean equals(Object obj) {
if (obj == this) return true;
Statement delegate = getInnermostDelegate();
@@ -97,6 +98,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public int hashCode() {
Object obj = getInnermostDelegate();
if (obj == null) {
@@ -151,6 +153,7 @@ public class DelegatingStatement extends
* Close this DelegatingStatement, and close
* any ResultSets that were not explicitly closed.
*/
+ @Override
public void close() throws SQLException {
try {
try {
@@ -204,11 +207,13 @@ public class DelegatingStatement extends
}
}
+ @Override
public Connection getConnection() throws SQLException {
checkOpen();
return _conn; // return the delegating connection that created this
}
+ @Override
public ResultSet executeQuery(String sql) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -223,6 +228,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public ResultSet getResultSet() throws SQLException {
checkOpen();
try {
@@ -234,6 +240,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public int executeUpdate(String sql) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -246,39 +253,51 @@ public class DelegatingStatement extends
}
}
+ @Override
public int getMaxFieldSize() throws SQLException
{ checkOpen(); try { return _stmt.getMaxFieldSize(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public void setMaxFieldSize(int max) throws SQLException
{ checkOpen(); try { _stmt.setMaxFieldSize(max); } catch (SQLException e) { handleException(e); } }
+ @Override
public int getMaxRows() throws SQLException
{ checkOpen(); try { return _stmt.getMaxRows(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public void setMaxRows(int max) throws SQLException
{ checkOpen(); try { _stmt.setMaxRows(max); } catch (SQLException e) { handleException(e); } }
+ @Override
public void setEscapeProcessing(boolean enable) throws SQLException
{ checkOpen(); try { _stmt.setEscapeProcessing(enable); } catch (SQLException e) { handleException(e); } }
+ @Override
public int getQueryTimeout() throws SQLException
{ checkOpen(); try { return _stmt.getQueryTimeout(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public void setQueryTimeout(int seconds) throws SQLException
{ checkOpen(); try { _stmt.setQueryTimeout(seconds); } catch (SQLException e) { handleException(e); } }
+ @Override
public void cancel() throws SQLException
{ checkOpen(); try { _stmt.cancel(); } catch (SQLException e) { handleException(e); } }
+ @Override
public SQLWarning getWarnings() throws SQLException
{ checkOpen(); try { return _stmt.getWarnings(); } catch (SQLException e) { handleException(e); throw new AssertionError(); } }
+ @Override
public void clearWarnings() throws SQLException
{ checkOpen(); try { _stmt.clearWarnings(); } catch (SQLException e) { handleException(e); } }
+ @Override
public void setCursorName(String name) throws SQLException
{ checkOpen(); try { _stmt.setCursorName(name); } catch (SQLException e) { handleException(e); } }
+ @Override
public boolean execute(String sql) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -292,36 +311,47 @@ public class DelegatingStatement extends
}
}
+ @Override
public int getUpdateCount() throws SQLException
{ checkOpen(); try { return _stmt.getUpdateCount(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public boolean getMoreResults() throws SQLException
{ checkOpen(); try { return _stmt.getMoreResults(); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public void setFetchDirection(int direction) throws SQLException
{ checkOpen(); try { _stmt.setFetchDirection(direction); } catch (SQLException e) { handleException(e); } }
+ @Override
public int getFetchDirection() throws SQLException
{ checkOpen(); try { return _stmt.getFetchDirection(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public void setFetchSize(int rows) throws SQLException
{ checkOpen(); try { _stmt.setFetchSize(rows); } catch (SQLException e) { handleException(e); } }
+ @Override
public int getFetchSize() throws SQLException
{ checkOpen(); try { return _stmt.getFetchSize(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public int getResultSetConcurrency() throws SQLException
{ checkOpen(); try { return _stmt.getResultSetConcurrency(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public int getResultSetType() throws SQLException
{ checkOpen(); try { return _stmt.getResultSetType(); } catch (SQLException e) { handleException(e); return 0; } }
+ @Override
public void addBatch(String sql) throws SQLException
{ checkOpen(); try { _stmt.addBatch(sql); } catch (SQLException e) { handleException(e); } }
+ @Override
public void clearBatch() throws SQLException
{ checkOpen(); try { _stmt.clearBatch(); } catch (SQLException e) { handleException(e); } }
+ @Override
public int[] executeBatch() throws SQLException {
checkOpen();
if (_conn != null) {
@@ -341,13 +371,16 @@ public class DelegatingStatement extends
* @return String
* @since 1.2.2
*/
+ @Override
public String toString() {
return _stmt.toString();
}
+ @Override
public boolean getMoreResults(int current) throws SQLException
{ checkOpen(); try { return _stmt.getMoreResults(current); } catch (SQLException e) { handleException(e); return false; } }
+ @Override
public ResultSet getGeneratedKeys() throws SQLException {
checkOpen();
try {
@@ -358,6 +391,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -371,6 +405,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public int executeUpdate(String sql, int columnIndexes[]) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -384,6 +419,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public int executeUpdate(String sql, String columnNames[]) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -397,6 +433,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -410,6 +447,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public boolean execute(String sql, int columnIndexes[]) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -423,6 +461,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public boolean execute(String sql, String columnNames[]) throws SQLException {
checkOpen();
if (_conn != null) {
@@ -436,6 +475,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public int getResultSetHoldability() throws SQLException
{ checkOpen(); try { return _stmt.getResultSetHoldability(); } catch (SQLException e) { handleException(e); return 0; } }
@@ -444,16 +484,19 @@ public class DelegatingStatement extends
* TODO Consider adding build flags to make this protected unless we are
* using JDBC 4.
*/
+ @Override
public boolean isClosed() throws SQLException {
return _closed;
}
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return iface.isAssignableFrom(getClass()) || _stmt.isWrapperFor(iface);
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
if (iface.isAssignableFrom(getClass())) {
return iface.cast(this);
@@ -464,6 +507,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public void setPoolable(boolean poolable) throws SQLException {
checkOpen();
try {
@@ -474,6 +518,7 @@ public class DelegatingStatement extends
}
}
+ @Override
public boolean isPoolable() throws SQLException {
checkOpen();
try {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverConnectionFactory.java Thu May 5 17:19:01 2011
@@ -34,6 +34,7 @@ public class DriverConnectionFactory imp
_props = props;
}
+ @Override
public Connection createConnection() throws SQLException {
return _driver.connect(_connectUri,_props);
}
@@ -42,6 +43,7 @@ public class DriverConnectionFactory imp
protected String _connectUri = null;
protected Properties _props = null;
+ @Override
public String toString() {
return this.getClass().getName() + " [" + String.valueOf(_driver) + ";" + String.valueOf(_connectUri) + ";" + String.valueOf(_props) + "]";
}
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DriverManagerConnectionFactory.java Thu May 5 17:19:01 2011
@@ -67,6 +67,7 @@ public class DriverManagerConnectionFact
_passwd = passwd;
}
+ @Override
public Connection createConnection() throws SQLException {
if(null == _props) {
if((_uname == null) && (_passwd == null)) {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java Thu May 5 17:19:01 2011
@@ -70,6 +70,7 @@ public class PoolableCallableStatement e
/**
* Returns the CallableStatement to the pool. If {{@link #isClosed()}, this is a No-op.
*/
+ @Override
public void close() throws SQLException {
// calling close twice should have no effect
if (!isClosed()) {
@@ -89,6 +90,7 @@ public class PoolableCallableStatement e
* Activates after retrieval from the pool. Adds a trace for this CallableStatement to the Connection
* that created it.
*/
+ @Override
protected void activate() throws SQLException {
_closed = false;
if( _conn != null ) {
@@ -101,6 +103,7 @@ public class PoolableCallableStatement e
* Passivates to prepare for return to the pool. Removes the trace associated with this CallableStatement
* from the Connection that created it. Also closes any associated ResultSets.
*/
+ @Override
protected void passivate() throws SQLException {
_closed = true;
if( _conn != null ) {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnection.java Thu May 5 17:19:01 2011
@@ -61,7 +61,8 @@ public class PoolableConnection extends
/**
* Returns me to my pool.
*/
- public synchronized void close() throws SQLException {
+ @Override
+ public synchronized void close() throws SQLException {
if (_closed) {
// already closed
return;
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java Thu May 5 17:19:01 2011
@@ -578,6 +578,7 @@ public class PoolableConnectionFactory i
_defaultCatalog = defaultCatalog;
}
+ @Override
public Object makeObject() throws Exception {
Connection conn = _connFactory.createConnection();
if (conn == null) {
@@ -623,12 +624,14 @@ public class PoolableConnectionFactory i
}
}
+ @Override
public void destroyObject(Object obj) throws Exception {
if(obj instanceof PoolableConnection) {
((PoolableConnection)obj).reallyClose();
}
}
+ @Override
public boolean validateObject(Object obj) {
if(obj instanceof Connection) {
try {
@@ -678,6 +681,7 @@ public class PoolableConnectionFactory i
}
}
+ @Override
public void passivateObject(Object obj) throws Exception {
if(obj instanceof Connection) {
Connection conn = (Connection)obj;
@@ -694,6 +698,7 @@ public class PoolableConnectionFactory i
}
}
+ @Override
public void activateObject(Object obj) throws Exception {
if(obj instanceof DelegatingConnection) {
((DelegatingConnection)obj).activate();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java Thu May 5 17:19:01 2011
@@ -73,6 +73,7 @@ public class PoolablePreparedStatement e
/**
* Add batch.
*/
+ @Override
public void addBatch() throws SQLException {
super.addBatch();
batchAdded = true;
@@ -81,6 +82,7 @@ public class PoolablePreparedStatement e
/**
* Clear Batch.
*/
+ @Override
public void clearBatch() throws SQLException {
batchAdded = false;
super.clearBatch();
@@ -89,6 +91,7 @@ public class PoolablePreparedStatement e
/**
* Return me to my pool.
*/
+ @Override
public void close() throws SQLException {
// calling close twice should have no effect
if (!isClosed()) {
@@ -104,6 +107,7 @@ public class PoolablePreparedStatement e
}
}
+ @Override
protected void activate() throws SQLException{
_closed = false;
if(_conn != null) {
@@ -112,6 +116,7 @@ public class PoolablePreparedStatement e
super.activate();
}
+ @Override
protected void passivate() throws SQLException {
_closed = true;
if(_conn != null) {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java Thu May 5 17:19:01 2011
@@ -76,6 +76,7 @@ public class PoolingConnection extends D
* Close and free all {@link PreparedStatement}s or {@link CallableStatement} from the pool, and
* close the underlying connection.
*/
+ @Override
public synchronized void close() throws SQLException {
if(null != _pstmtPool) {
KeyedObjectPool oldpool = _pstmtPool;
@@ -98,6 +99,7 @@ public class PoolingConnection extends D
* @param sql the sql string used to define the PreparedStatement
* @return a {@link PoolablePreparedStatement}
*/
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
if (null == _pstmtPool) {
throw new SQLException(
@@ -121,6 +123,7 @@ public class PoolingConnection extends D
* @param resultSetConcurrency result set concurrency
* @return a {@link PoolablePreparedStatement}
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
if (null == _pstmtPool) {
throw new SQLException(
@@ -144,6 +147,7 @@ public class PoolingConnection extends D
* @throws SQLException
* @since 1.3
*/
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
try {
return (CallableStatement) (_pstmtPool.borrowObject(createKey(sql, STATEMENT_CALLABLESTMT)));
@@ -165,6 +169,7 @@ public class PoolingConnection extends D
* @throws SQLException
* @since 1.3
*/
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
try {
return (CallableStatement) (_pstmtPool.borrowObject(createKey(sql, resultSetType,
@@ -275,6 +280,7 @@ public class PoolingConnection extends D
* @param obj the key for the {@link PreparedStatement} to be created
* @see #createKey(String, int, int, byte)
*/
+ @Override
public Object makeObject(Object obj) throws Exception {
if(null == obj || !(obj instanceof PStmtKey)) {
throw new IllegalArgumentException("Prepared statement key is null or invalid.");
@@ -306,6 +312,7 @@ public class PoolingConnection extends D
* @param key ignored
* @param obj the pooled statement to be destroyed.
*/
+ @Override
public void destroyObject(Object key, Object obj) throws Exception {
if(obj instanceof DelegatingPreparedStatement) {
((DelegatingPreparedStatement)obj).getInnermostDelegate().close();
@@ -322,6 +329,7 @@ public class PoolingConnection extends D
* @param obj ignored
* @return <tt>true</tt>
*/
+ @Override
public boolean validateObject(Object key, Object obj) {
return true;
}
@@ -333,6 +341,7 @@ public class PoolingConnection extends D
* @param key ignored
* @param obj pooled statement to be activated
*/
+ @Override
public void activateObject(Object key, Object obj) throws Exception {
((DelegatingPreparedStatement)obj).activate();
}
@@ -345,11 +354,13 @@ public class PoolingConnection extends D
* @param key ignored
* @param obj a {@link PreparedStatement}
*/
+ @Override
public void passivateObject(Object key, Object obj) throws Exception {
((PreparedStatement)obj).clearParameters();
((DelegatingPreparedStatement)obj).passivate();
}
+ @Override
public String toString() {
if (_pstmtPool != null ) {
return "PoolingConnection: " + _pstmtPool.toString();
@@ -417,6 +428,7 @@ public class PoolingConnection extends D
_stmtType = stmtType;
}
+ @Override
public boolean equals(Object that) {
try {
PStmtKey key = (PStmtKey)that;
@@ -433,6 +445,7 @@ public class PoolingConnection extends D
}
}
+ @Override
public int hashCode() {
if (_catalog==null)
return(null == _sql ? 0 : _sql.hashCode());
@@ -440,6 +453,7 @@ public class PoolingConnection extends D
return(null == _sql ? _catalog.hashCode() : (_catalog + _sql).hashCode());
}
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("PStmtKey: sql=");
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDataSource.java Thu May 5 17:19:01 2011
@@ -86,10 +86,12 @@ public class PoolingDataSource implement
}
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("PoolingDataSource is not a wrapper.");
}
@@ -101,6 +103,7 @@ public class PoolingDataSource implement
* Return a {@link java.sql.Connection} from my pool,
* according to the contract specified by {@link ObjectPool#borrowObject}.
*/
+ @Override
public Connection getConnection() throws SQLException {
try {
Connection conn = (Connection)(_pool.borrowObject());
@@ -123,6 +126,7 @@ public class PoolingDataSource implement
* Throws {@link UnsupportedOperationException}
* @throws UnsupportedOperationException
*/
+ @Override
public Connection getConnection(String uname, String passwd) throws SQLException {
throw new UnsupportedOperationException();
}
@@ -132,6 +136,7 @@ public class PoolingDataSource implement
* @return my log writer
* @see DataSource#getLogWriter
*/
+ @Override
public PrintWriter getLogWriter() {
return _logWriter;
}
@@ -141,6 +146,7 @@ public class PoolingDataSource implement
* @throws UnsupportedOperationException As this
* implementation does not support this feature.
*/
+ @Override
public int getLoginTimeout() {
throw new UnsupportedOperationException("Login timeout is not supported.");
}
@@ -150,6 +156,7 @@ public class PoolingDataSource implement
* @throws UnsupportedOperationException As this
* implementation does not support this feature.
*/
+ @Override
public void setLoginTimeout(int seconds) {
throw new UnsupportedOperationException("Login timeout is not supported.");
}
@@ -158,6 +165,7 @@ public class PoolingDataSource implement
* Sets my log writer.
* @see DataSource#setLogWriter
*/
+ @Override
public void setLogWriter(PrintWriter out) {
_logWriter = out;
}
@@ -180,12 +188,14 @@ public class PoolingDataSource implement
this.delegate = delegate;
}
+ @Override
protected void checkOpen() throws SQLException {
if(delegate == null) {
throw new SQLException("Connection is closed.");
}
}
+ @Override
public void close() throws SQLException {
if (delegate != null) {
this.delegate.close();
@@ -194,6 +204,7 @@ public class PoolingDataSource implement
}
}
+ @Override
public boolean isClosed() throws SQLException {
if (delegate == null) {
return true;
@@ -201,26 +212,31 @@ public class PoolingDataSource implement
return delegate.isClosed();
}
+ @Override
public void clearWarnings() throws SQLException {
checkOpen();
delegate.clearWarnings();
}
+ @Override
public void commit() throws SQLException {
checkOpen();
delegate.commit();
}
+ @Override
public Statement createStatement() throws SQLException {
checkOpen();
return new DelegatingStatement(this, delegate.createStatement());
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new DelegatingStatement(this, delegate.createStatement(resultSetType, resultSetConcurrency));
}
+ @Override
public boolean innermostDelegateEquals(Connection c) {
Connection innerCon = super.getInnermostDelegate();
if (innerCon == null) {
@@ -230,36 +246,43 @@ public class PoolingDataSource implement
}
}
+ @Override
public boolean getAutoCommit() throws SQLException {
checkOpen();
return delegate.getAutoCommit();
}
+ @Override
public String getCatalog() throws SQLException {
checkOpen();
return delegate.getCatalog();
}
+ @Override
public DatabaseMetaData getMetaData() throws SQLException {
checkOpen();
return delegate.getMetaData();
}
+ @Override
public int getTransactionIsolation() throws SQLException {
checkOpen();
return delegate.getTransactionIsolation();
}
+ @Override
public Map getTypeMap() throws SQLException {
checkOpen();
return delegate.getTypeMap();
}
+ @Override
public SQLWarning getWarnings() throws SQLException {
checkOpen();
return delegate.getWarnings();
}
+ @Override
public int hashCode() {
if (delegate == null){
return 0;
@@ -267,6 +290,7 @@ public class PoolingDataSource implement
return delegate.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj == null) {
return false;
@@ -288,66 +312,79 @@ public class PoolingDataSource implement
}
}
+ @Override
public boolean isReadOnly() throws SQLException {
checkOpen();
return delegate.isReadOnly();
}
+ @Override
public String nativeSQL(String sql) throws SQLException {
checkOpen();
return delegate.nativeSQL(sql);
}
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
checkOpen();
return new DelegatingCallableStatement(this, delegate.prepareCall(sql));
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new DelegatingCallableStatement(this, delegate.prepareCall(sql, resultSetType, resultSetConcurrency));
}
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, resultSetType, resultSetConcurrency));
}
+ @Override
public void rollback() throws SQLException {
checkOpen();
delegate.rollback();
}
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
checkOpen();
delegate.setAutoCommit(autoCommit);
}
+ @Override
public void setCatalog(String catalog) throws SQLException {
checkOpen();
delegate.setCatalog(catalog);
}
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
checkOpen();
delegate.setReadOnly(readOnly);
}
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
checkOpen();
delegate.setTransactionIsolation(level);
}
+ @Override
public void setTypeMap(Map map) throws SQLException {
checkOpen();
delegate.setTypeMap(map);
}
+ @Override
public String toString() {
if (delegate == null){
return "NULL";
@@ -355,61 +392,73 @@ public class PoolingDataSource implement
return delegate.toString();
}
+ @Override
public int getHoldability() throws SQLException {
checkOpen();
return delegate.getHoldability();
}
+ @Override
public void setHoldability(int holdability) throws SQLException {
checkOpen();
delegate.setHoldability(holdability);
}
+ @Override
public java.sql.Savepoint setSavepoint() throws SQLException {
checkOpen();
return delegate.setSavepoint();
}
+ @Override
public java.sql.Savepoint setSavepoint(String name) throws SQLException {
checkOpen();
return delegate.setSavepoint(name);
}
+ @Override
public void releaseSavepoint(java.sql.Savepoint savepoint) throws SQLException {
checkOpen();
delegate.releaseSavepoint(savepoint);
}
+ @Override
public void rollback(java.sql.Savepoint savepoint) throws SQLException {
checkOpen();
delegate.rollback(savepoint);
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
checkOpen();
return new DelegatingStatement(this, delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
checkOpen();
return new DelegatingCallableStatement(this, delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, autoGeneratedKeys));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this,delegate.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, columnIndexes));
}
+ @Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, columnNames));
@@ -418,6 +467,7 @@ public class PoolingDataSource implement
/**
* @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
*/
+ @Override
public Connection getDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return super.getDelegate();
@@ -429,6 +479,7 @@ public class PoolingDataSource implement
/**
* @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
*/
+ @Override
public Connection getInnermostDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return super.getInnermostDelegate();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java Thu May 5 17:19:01 2011
@@ -162,6 +162,7 @@ public class PoolingDriver implements Dr
return (String[]) names.toArray(new String[names.size()]);
}
+ @Override
public boolean acceptsURL(String url) throws SQLException {
try {
return url.startsWith(URL_PREFIX);
@@ -170,6 +171,7 @@ public class PoolingDriver implements Dr
}
}
+ @Override
public Connection connect(String url, Properties info) throws SQLException {
if(acceptsURL(url)) {
ObjectPool pool = getConnectionPool(url.substring(URL_PREFIX_LEN));
@@ -223,18 +225,22 @@ public class PoolingDriver implements Dr
}
}
+ @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];
}
@@ -262,12 +268,14 @@ public class PoolingDriver implements Dr
this.delegate = delegate;
}
+ @Override
protected void checkOpen() throws SQLException {
if(delegate == null) {
throw new SQLException("Connection is closed.");
}
}
+ @Override
public void close() throws SQLException {
if (delegate != null) {
this.delegate.close();
@@ -276,6 +284,7 @@ public class PoolingDriver implements Dr
}
}
+ @Override
public boolean isClosed() throws SQLException {
if (delegate == null) {
return true;
@@ -283,26 +292,31 @@ public class PoolingDriver implements Dr
return delegate.isClosed();
}
+ @Override
public void clearWarnings() throws SQLException {
checkOpen();
delegate.clearWarnings();
}
+ @Override
public void commit() throws SQLException {
checkOpen();
delegate.commit();
}
+ @Override
public Statement createStatement() throws SQLException {
checkOpen();
return new DelegatingStatement(this, delegate.createStatement());
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new DelegatingStatement(this, delegate.createStatement(resultSetType, resultSetConcurrency));
}
+ @Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (delegate == null){
@@ -311,36 +325,43 @@ public class PoolingDriver implements Dr
return delegate.equals(obj);
}
+ @Override
public boolean getAutoCommit() throws SQLException {
checkOpen();
return delegate.getAutoCommit();
}
+ @Override
public String getCatalog() throws SQLException {
checkOpen();
return delegate.getCatalog();
}
+ @Override
public DatabaseMetaData getMetaData() throws SQLException {
checkOpen();
return delegate.getMetaData();
}
+ @Override
public int getTransactionIsolation() throws SQLException {
checkOpen();
return delegate.getTransactionIsolation();
}
+ @Override
public Map getTypeMap() throws SQLException {
checkOpen();
return delegate.getTypeMap();
}
+ @Override
public SQLWarning getWarnings() throws SQLException {
checkOpen();
return delegate.getWarnings();
}
+ @Override
public int hashCode() {
if (delegate == null){
return 0;
@@ -348,66 +369,79 @@ public class PoolingDriver implements Dr
return delegate.hashCode();
}
+ @Override
public boolean isReadOnly() throws SQLException {
checkOpen();
return delegate.isReadOnly();
}
+ @Override
public String nativeSQL(String sql) throws SQLException {
checkOpen();
return delegate.nativeSQL(sql);
}
+ @Override
public CallableStatement prepareCall(String sql) throws SQLException {
checkOpen();
return new DelegatingCallableStatement(this, delegate.prepareCall(sql));
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new DelegatingCallableStatement(this, delegate.prepareCall(sql, resultSetType, resultSetConcurrency));
}
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, resultSetType, resultSetConcurrency));
}
+ @Override
public void rollback() throws SQLException {
checkOpen();
delegate.rollback();
}
+ @Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
checkOpen();
delegate.setAutoCommit(autoCommit);
}
+ @Override
public void setCatalog(String catalog) throws SQLException {
checkOpen();
delegate.setCatalog(catalog);
}
+ @Override
public void setReadOnly(boolean readOnly) throws SQLException {
checkOpen();
delegate.setReadOnly(readOnly);
}
+ @Override
public void setTransactionIsolation(int level) throws SQLException {
checkOpen();
delegate.setTransactionIsolation(level);
}
+ @Override
public void setTypeMap(Map map) throws SQLException {
checkOpen();
delegate.setTypeMap(map);
}
+ @Override
public String toString() {
if (delegate == null){
return "NULL";
@@ -415,61 +449,73 @@ public class PoolingDriver implements Dr
return delegate.toString();
}
+ @Override
public int getHoldability() throws SQLException {
checkOpen();
return delegate.getHoldability();
}
+ @Override
public void setHoldability(int holdability) throws SQLException {
checkOpen();
delegate.setHoldability(holdability);
}
+ @Override
public java.sql.Savepoint setSavepoint() throws SQLException {
checkOpen();
return delegate.setSavepoint();
}
+ @Override
public java.sql.Savepoint setSavepoint(String name) throws SQLException {
checkOpen();
return delegate.setSavepoint(name);
}
+ @Override
public void releaseSavepoint(java.sql.Savepoint savepoint) throws SQLException {
checkOpen();
delegate.releaseSavepoint(savepoint);
}
+ @Override
public void rollback(java.sql.Savepoint savepoint) throws SQLException {
checkOpen();
delegate.rollback(savepoint);
}
+ @Override
public Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
checkOpen();
return new DelegatingStatement(this, delegate.createStatement(resultSetType, resultSetConcurrency, resultSetHoldability));
}
+ @Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
checkOpen();
return new DelegatingCallableStatement(this, delegate.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, autoGeneratedKeys));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability));
}
+ @Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, columnIndexes));
}
+ @Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
checkOpen();
return new DelegatingPreparedStatement(this, delegate.prepareStatement(sql, columnNames));
@@ -478,6 +524,7 @@ public class PoolingDriver implements Dr
/**
* @see org.apache.commons.dbcp2.DelegatingConnection#getDelegate()
*/
+ @Override
public Connection getDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return super.getDelegate();
@@ -489,6 +536,7 @@ public class PoolingDriver implements Dr
/**
* @see org.apache.commons.dbcp2.DelegatingConnection#getInnermostDelegate()
*/
+ @Override
public Connection getInnermostDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return super.getInnermostDelegate();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/ConnectionImpl.java Thu May 5 17:19:01 2011
@@ -71,6 +71,7 @@ class ConnectionImpl extends DelegatingC
*
* @exception SQLException The database connection couldn't be closed.
*/
+ @Override
public void close() throws SQLException {
if (!_closed) {
_closed = true;
@@ -89,6 +90,7 @@ class ConnectionImpl extends DelegatingC
* @exception SQLException if this connection is closed or an error occurs
* in the wrapped connection.
*/
+ @Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
checkOpen();
try {
@@ -109,6 +111,7 @@ class ConnectionImpl extends DelegatingC
* @exception SQLException if this connection is closed or an error occurs
* in the wrapped connection.
*/
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType,
int resultSetConcurrency)
throws SQLException {
@@ -124,6 +127,7 @@ class ConnectionImpl extends DelegatingC
}
}
+ @Override
public PreparedStatement prepareStatement(String sql, int resultSetType,
int resultSetConcurrency,
int resultSetHoldability)
@@ -140,6 +144,7 @@ class ConnectionImpl extends DelegatingC
}
}
+ @Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
throws SQLException {
checkOpen();
@@ -153,6 +158,7 @@ class ConnectionImpl extends DelegatingC
}
}
+ @Override
public PreparedStatement prepareStatement(String sql, int columnIndexes[])
throws SQLException {
checkOpen();
@@ -166,6 +172,7 @@ class ConnectionImpl extends DelegatingC
}
}
+ @Override
public PreparedStatement prepareStatement(String sql, String columnNames[])
throws SQLException {
checkOpen();
@@ -197,6 +204,7 @@ class ConnectionImpl extends DelegatingC
* @return the internal connection, or null if access is not allowed.
* @see #isAccessToUnderlyingConnectionAllowed()
*/
+ @Override
public Connection getDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return getDelegateInternal();
@@ -210,6 +218,7 @@ class ConnectionImpl extends DelegatingC
* @return the innermost internal connection, or null if access is not allowed.
* @see #isAccessToUnderlyingConnectionAllowed()
*/
+ @Override
public Connection getInnermostDelegate() {
if (isAccessToUnderlyingConnectionAllowed()) {
return super.getInnermostDelegateInternal();
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java Thu May 5 17:19:01 2011
@@ -146,6 +146,7 @@ public class DriverAdapterCPDS
* Attempt to establish a database connection using the default
* user and password.
*/
+ @Override
public PooledConnection getPooledConnection() throws SQLException {
return getPooledConnection(getUser(), getPassword());
}
@@ -155,6 +156,7 @@ public class DriverAdapterCPDS
* @param username name to be used for the connection
* @param pass password to be used fur the connection
*/
+ @Override
public PooledConnection getPooledConnection(String username,
String pass)
throws SQLException {
@@ -232,6 +234,7 @@ public class DriverAdapterCPDS
/**
* <CODE>Referenceable</CODE> implementation.
*/
+ @Override
public Reference getReference() throws NamingException {
// this class implements its own factory
String factory = getClass().getName();
@@ -271,6 +274,7 @@ public class DriverAdapterCPDS
/**
* implements ObjectFactory to create an instance of this class
*/
+ @Override
public Object getObjectInstance(Object refObj, Name name,
Context context, Hashtable env)
throws Exception {
@@ -504,6 +508,7 @@ public class DriverAdapterCPDS
* Gets the maximum time in seconds that this data source can wait
* while attempting to connect to a database. NOT USED.
*/
+ @Override
public int getLoginTimeout() {
return loginTimeout;
}
@@ -511,6 +516,7 @@ public class DriverAdapterCPDS
/**
* Get the log writer for this data source. NOT USED.
*/
+ @Override
public PrintWriter getLogWriter() {
return logWriter;
}
@@ -519,6 +525,7 @@ public class DriverAdapterCPDS
* Sets the maximum time in seconds that this data source will wait
* while attempting to connect to a database. NOT USED.
*/
+ @Override
public void setLoginTimeout(int seconds) {
loginTimeout = seconds;
}
@@ -526,6 +533,7 @@ public class DriverAdapterCPDS
/**
* Set the log writer for this data source. NOT USED.
*/
+ @Override
public void setLogWriter(java.io.PrintWriter out) {
logWriter = out;
}
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PoolablePreparedStatementStub.java Thu May 5 17:19:01 2011
@@ -45,10 +45,12 @@ class PoolablePreparedStatementStub exte
super(stmt, key, pool, conn);
}
+ @Override
protected void activate() throws SQLException {
super.activate();
}
+ @Override
protected void passivate() throws SQLException {
super.passivate();
}
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java Thu May 5 17:19:01 2011
@@ -110,6 +110,7 @@ class PooledConnectionImpl
/**
* {@inheritDoc}
*/
+ @Override
public void addConnectionEventListener(ConnectionEventListener listener) {
if (!eventListeners.contains(listener)) {
eventListeners.add(listener);
@@ -117,6 +118,7 @@ class PooledConnectionImpl
}
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public void addStatementEventListener(StatementEventListener listener) {
if (!statementEventListeners.contains(listener)) {
statementEventListeners.add(listener);
@@ -131,6 +133,7 @@ class PooledConnectionImpl
*
* @exception SQLException if an error occurs or the connection is already closed
*/
+ @Override
public void close() throws SQLException {
assertOpen();
isClosed = true;
@@ -170,6 +173,7 @@ class PooledConnectionImpl
* @return The database connection.
* @throws SQLException if the connection is not open or the previous logical connection is still open
*/
+ @Override
public Connection getConnection() throws SQLException {
assertOpen();
// make sure the last connection is marked as closed
@@ -189,12 +193,14 @@ class PooledConnectionImpl
/**
* {@inheritDoc}
*/
+ @Override
public void removeConnectionEventListener(
ConnectionEventListener listener) {
eventListeners.remove(listener);
}
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public void removeStatementEventListener(StatementEventListener listener) {
statementEventListeners.remove(listener);
}
@@ -204,6 +210,7 @@ class PooledConnectionImpl
* Closes the physical connection and checks that the logical connection
* was closed as well.
*/
+ @Override
protected void finalize() throws Throwable {
// Closing the Connection ensures that if anyone tries to use it,
// an error will occur.
@@ -423,6 +430,7 @@ class PooledConnectionImpl
* {*link PreparedStatement}s.
* @param obj the key for the {*link PreparedStatement} to be created
*/
+ @Override
public Object makeObject(Object obj) throws Exception {
if (null == obj || !(obj instanceof PStmtKey)) {
throw new IllegalArgumentException();
@@ -457,6 +465,7 @@ class PooledConnectionImpl
* @param key ignored
* @param obj the {*link PreparedStatement} to be destroyed.
*/
+ @Override
public void destroyObject(Object key, Object obj) throws Exception {
//_openPstmts--;
if (obj instanceof DelegatingPreparedStatement) {
@@ -473,6 +482,7 @@ class PooledConnectionImpl
* @param obj ignored
* @return <tt>true</tt>
*/
+ @Override
public boolean validateObject(Object key, Object obj) {
return true;
}
@@ -483,6 +493,7 @@ class PooledConnectionImpl
* @param key ignored
* @param obj ignored
*/
+ @Override
public void activateObject(Object key, Object obj) throws Exception {
((PoolablePreparedStatementStub) obj).activate();
}
@@ -493,6 +504,7 @@ class PooledConnectionImpl
* @param key ignored
* @param obj a {*link PreparedStatement}
*/
+ @Override
public void passivateObject(Object key, Object obj) throws Exception {
((PreparedStatement) obj).clearParameters();
((PoolablePreparedStatementStub) obj).passivate();
@@ -564,6 +576,7 @@ class PooledConnectionImpl
}
+ @Override
public boolean equals(Object that) {
try {
PStmtKey key = (PStmtKey) that;
@@ -582,10 +595,12 @@ class PooledConnectionImpl
}
}
+ @Override
public int hashCode() {
return(null == _sql ? 0 : _sql.hashCode());
}
+ @Override
public String toString() {
StringBuffer buf = new StringBuffer();
buf.append("PStmtKey: sql=");
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java Thu May 5 17:19:01 2011
@@ -125,6 +125,7 @@ class CPDSConnectionFactory
return _pool;
}
+ @Override
public synchronized Object makeObject() {
Object obj;
try {
@@ -153,6 +154,7 @@ class CPDSConnectionFactory
/**
* Closes the PooledConnection and stops listening for events from it.
*/
+ @Override
public void destroyObject(Object obj) throws Exception {
if (obj instanceof PooledConnectionAndInfo) {
PooledConnection pc = ((PooledConnectionAndInfo)obj).getPooledConnection();
@@ -162,6 +164,7 @@ class CPDSConnectionFactory
}
}
+ @Override
public boolean validateObject(Object obj) {
boolean valid = false;
if (obj instanceof PooledConnectionAndInfo) {
@@ -224,9 +227,11 @@ class CPDSConnectionFactory
return valid;
}
+ @Override
public void passivateObject(Object obj) {
}
+ @Override
public void activateObject(Object obj) {
}
@@ -240,6 +245,7 @@ class CPDSConnectionFactory
* method of this connection object. What we need to do here is to
* release this PooledConnection from our pool...
*/
+ @Override
public void connectionClosed(ConnectionEvent event) {
PooledConnection pc = (PooledConnection) event.getSource();
// if this event occured becase we were validating, ignore it
@@ -271,6 +277,7 @@ class CPDSConnectionFactory
* If a fatal error occurs, close the underlying physical connection so as
* not to be returned in the future
*/
+ @Override
public void connectionErrorOccurred(ConnectionEvent event) {
PooledConnection pc = (PooledConnection)event.getSource();
if (null != event.getSQLException()) {
@@ -302,6 +309,7 @@ class CPDSConnectionFactory
* Also closes the pool. This ensures that all idle connections are closed
* and connections that are checked out are closed on return.
*/
+ @Override
public void invalidate(PooledConnection pc) throws SQLException {
Object info = pcMap.get(pc);
if (info == null) {
@@ -320,6 +328,7 @@ class CPDSConnectionFactory
*
* @param password new password
*/
+ @Override
public synchronized void setPassword(String password) {
_password = password;
}
@@ -328,6 +337,7 @@ class CPDSConnectionFactory
* Verifies that the username matches the user whose connections are being managed by this
* factory and closes the pool if this is the case; otherwise does nothing.
*/
+ @Override
public void closePool(String username) throws SQLException {
synchronized (this) {
if (username == null || !username.equals(_username)) {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyDataSource.java Thu May 5 17:19:01 2011
@@ -168,10 +168,12 @@ public abstract class InstanceKeyDataSou
protected abstract PooledConnectionManager getConnectionManager(UserPassKey upkey);
/* JDBC_4_ANT_KEY_BEGIN */
+ @Override
public boolean isWrapperFor(Class<?> iface) throws SQLException {
return false;
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException("InstanceKeyDataSource is not a wrapper.");
}
@@ -387,6 +389,7 @@ public abstract class InstanceKeyDataSou
* Get the value of loginTimeout.
* @return value of loginTimeout.
*/
+ @Override
public int getLoginTimeout() {
return loginTimeout;
}
@@ -395,6 +398,7 @@ public abstract class InstanceKeyDataSou
* Set the value of loginTimeout.
* @param v Value to assign to loginTimeout.
*/
+ @Override
public void setLoginTimeout(int v) {
this.loginTimeout = v;
}
@@ -403,6 +407,7 @@ public abstract class InstanceKeyDataSou
* Get the value of logWriter.
* @return value of logWriter.
*/
+ @Override
public PrintWriter getLogWriter() {
if (logWriter == null) {
logWriter = new PrintWriter(System.out);
@@ -414,6 +419,7 @@ public abstract class InstanceKeyDataSou
* Set the value of logWriter.
* @param v Value to assign to logWriter.
*/
+ @Override
public void setLogWriter(PrintWriter v) {
this.logWriter = v;
}
@@ -672,6 +678,7 @@ public abstract class InstanceKeyDataSou
/**
* Attempt to establish a database connection.
*/
+ @Override
public Connection getConnection() throws SQLException {
return getConnection(null, null);
}
@@ -688,6 +695,7 @@ public abstract class InstanceKeyDataSou
* repeatedly invoked until a <code>PooledConnectionAndInfo</code> instance with the new password is returned.
*
*/
+ @Override
public Connection getConnection(String username, String password)
throws SQLException {
if (instanceKey == null) {
@@ -880,6 +888,7 @@ public abstract class InstanceKeyDataSou
// TODO: Remove the implementation of this method at next major
// version release.
+ @Override
public Reference getReference() throws NamingException {
final String className = getClass().getName();
final String factoryName = className + "Factory"; // XXX: not robust
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java Thu May 5 17:19:01 2011
@@ -89,6 +89,7 @@ abstract class InstanceKeyObjectFactory
* implements ObjectFactory to create an instance of SharedPoolDataSource
* or PerUserPoolDataSource
*/
+ @Override
public Object getObjectInstance(Object refObj, Name name,
Context context, Hashtable env)
throws IOException, ClassNotFoundException {
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1099879&r1=1099878&r2=1099879&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java Thu May 5 17:19:01 2011
@@ -114,6 +114,7 @@ class KeyedCPDSConnectionFactory
* @throws SQLException if the connection could not be created.
* @see org.apache.commons.pool2.KeyedPoolableObjectFactory#makeObject(java.lang.Object)
*/
+ @Override
public synchronized Object makeObject(Object key) throws Exception {
Object obj = null;
UserPassKey upkey = (UserPassKey)key;
@@ -143,6 +144,7 @@ class KeyedCPDSConnectionFactory
/**
* Closes the PooledConnection and stops listening for events from it.
*/
+ @Override
public void destroyObject(Object key, Object obj) throws Exception {
if (obj instanceof PooledConnectionAndInfo) {
PooledConnection pc = ((PooledConnectionAndInfo)obj).getPooledConnection();
@@ -159,6 +161,7 @@ class KeyedCPDSConnectionFactory
* @param obj {@link PooledConnectionAndInfo} containing the connection to validate
* @return true if validation suceeds
*/
+ @Override
public boolean validateObject(Object key, Object obj) {
boolean valid = false;
if (obj instanceof PooledConnectionAndInfo) {
@@ -221,9 +224,11 @@ class KeyedCPDSConnectionFactory
return valid;
}
+ @Override
public void passivateObject(Object key, Object obj) {
}
+ @Override
public void activateObject(Object key, Object obj) {
}
@@ -237,6 +242,7 @@ class KeyedCPDSConnectionFactory
* method of this connection object. What we need to do here is to
* release this PooledConnection from our pool...
*/
+ @Override
public void connectionClosed(ConnectionEvent event) {
PooledConnection pc = (PooledConnection)event.getSource();
// if this event occurred because we were validating, or if this
@@ -269,6 +275,7 @@ class KeyedCPDSConnectionFactory
* If a fatal error occurs, close the underlying physical connection so as
* not to be returned in the future
*/
+ @Override
public void connectionErrorOccurred(ConnectionEvent event) {
PooledConnection pc = (PooledConnection)event.getSource();
if (null != event.getSQLException()) {
@@ -301,6 +308,7 @@ class KeyedCPDSConnectionFactory
* to create the PooledConnection. Connections associated with this user
* are not affected and they will not be automatically closed on return to the pool.
*/
+ @Override
public void invalidate(PooledConnection pc) throws SQLException {
PooledConnectionAndInfo info = (PooledConnectionAndInfo) pcMap.get(pc);
if (info == null) {
@@ -318,6 +326,7 @@ class KeyedCPDSConnectionFactory
/**
* Does nothing. This factory does not cache user credentials.
*/
+ @Override
public void setPassword(String password) {
}
@@ -326,6 +335,7 @@ class KeyedCPDSConnectionFactory
* this would affect all users. Instead, it clears the pool associated
* with the given user. This method is not currently used.
*/
+ @Override
public void closePool(String username) throws SQLException {
try {
_pool.clear(new UserPassKey(username, null));