This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 25d385d Add missing @Deprecated annotations
25d385d is described below
commit 25d385d83c12db28907122ca73b064b484f1aaa1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sun Mar 17 22:34:57 2019 +0000
Add missing @Deprecated annotations
---
java/org/apache/tomcat/dbcp/dbcp/DbcpException.java | 1 +
java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java | 1 +
java/org/apache/tomcat/dbcp/dbcp/DelegatingPreparedStatement.java | 1 +
java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java | 4 ++++
java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java | 1 +
java/org/apache/tomcat/dbcp/dbcp/SQLNestedException.java | 1 +
java/org/apache/tomcat/dbcp/pool/impl/StackObjectPoolFactory.java | 1 +
7 files changed, 10 insertions(+)
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DbcpException.java
b/java/org/apache/tomcat/dbcp/dbcp/DbcpException.java
index eb72203..3a95383 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DbcpException.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DbcpException.java
@@ -28,6 +28,7 @@ package org.apache.tomcat.dbcp.dbcp;
*
* @deprecated This will be removed in a future version of DBCP.
**/
+@Deprecated
public class DbcpException extends RuntimeException {
private static final long serialVersionUID = 2477800549022838103L;
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
b/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
index 0fc5938..0b5f50b 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
@@ -138,6 +138,7 @@ public class DelegatingCallableStatement extends
DelegatingPreparedStatement
{ checkOpen(); try { return ((CallableStatement)_stmt).getDouble(
parameterIndex); } catch (SQLException e) { handleException(e); return 0; } }
/** @deprecated */
+ @Deprecated
@Override
public BigDecimal getBigDecimal(int parameterIndex, int scale) throws
SQLException
{ checkOpen(); try { return ((CallableStatement)_stmt).getBigDecimal(
parameterIndex, scale); } catch (SQLException e) { handleException(e); return
null; } }
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingPreparedStatement.java
b/java/org/apache/tomcat/dbcp/dbcp/DelegatingPreparedStatement.java
index ac33296..706deb4 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingPreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingPreparedStatement.java
@@ -179,6 +179,7 @@ public class DelegatingPreparedStatement extends
DelegatingStatement
{ checkOpen(); try {
((PreparedStatement)_stmt).setAsciiStream(parameterIndex,x,length); } catch
(SQLException e) { handleException(e); } }
/** @deprecated */
+ @Deprecated
@Override
public void setUnicodeStream(int parameterIndex, java.io.InputStream x,
int length) throws SQLException
{ checkOpen(); try {
((PreparedStatement)_stmt).setUnicodeStream(parameterIndex,x,length); } catch
(SQLException e) { handleException(e); } }
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
b/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
index a2738fb..2812f12 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
@@ -249,6 +249,7 @@ public class DelegatingResultSet extends AbandonedTrace
implements ResultSet {
{ try { return _res.getDouble(columnIndex); } catch (SQLException e) {
handleException(e); return 0; } }
/** @deprecated */
+ @Deprecated
@Override
public BigDecimal getBigDecimal(int columnIndex, int scale) throws
SQLException
{ try { return _res.getBigDecimal(columnIndex); } catch (SQLException e) {
handleException(e); return null; } }
@@ -274,6 +275,7 @@ public class DelegatingResultSet extends AbandonedTrace
implements ResultSet {
{ try { return _res.getAsciiStream(columnIndex); } catch (SQLException e)
{ handleException(e); return null; } }
/** @deprecated */
+ @Deprecated
@Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException
{ try { return _res.getUnicodeStream(columnIndex); } catch (SQLException
e) { handleException(e); return null; } }
@@ -315,6 +317,7 @@ public class DelegatingResultSet extends AbandonedTrace
implements ResultSet {
{ try { return _res.getDouble(columnName); } catch (SQLException e) {
handleException(e); return 0; } }
/** @deprecated */
+ @Deprecated
@Override
public BigDecimal getBigDecimal(String columnName, int scale) throws
SQLException
{ try { return _res.getBigDecimal(columnName); } catch (SQLException e) {
handleException(e); return null; } }
@@ -340,6 +343,7 @@ public class DelegatingResultSet extends AbandonedTrace
implements ResultSet {
{ try { return _res.getAsciiStream(columnName); } catch (SQLException e) {
handleException(e); return null; } }
/** @deprecated */
+ @Deprecated
@Override
public InputStream getUnicodeStream(String columnName) throws SQLException
{ try { return _res.getUnicodeStream(columnName); } catch (SQLException e)
{ handleException(e); return null; } }
diff --git a/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
b/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
index 0d26126..a83ffa8 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
@@ -94,6 +94,7 @@ public class PoolingDriver implements Driver {
*
* @deprecated This will be removed in a future version of DBCP.
*/
+ @Deprecated
public synchronized ObjectPool getPool(String name) {
try {
return getConnectionPool(name);
diff --git a/java/org/apache/tomcat/dbcp/dbcp/SQLNestedException.java
b/java/org/apache/tomcat/dbcp/dbcp/SQLNestedException.java
index 04bd6ae..7e17587 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/SQLNestedException.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/SQLNestedException.java
@@ -25,6 +25,7 @@ import java.sql.SQLException;
* @author Dirk Verbeeck
* @deprecated Use '(SQLException) new SQLException(msg).initCause(e)'
instead; this class will be removed in DBCP 2.0
*/
+@Deprecated
public class SQLNestedException extends SQLException {
private static final long serialVersionUID = 1046151479543081202L;
diff --git a/java/org/apache/tomcat/dbcp/pool/impl/StackObjectPoolFactory.java
b/java/org/apache/tomcat/dbcp/pool/impl/StackObjectPoolFactory.java
index 5b1349e..f5cf823 100644
--- a/java/org/apache/tomcat/dbcp/pool/impl/StackObjectPoolFactory.java
+++ b/java/org/apache/tomcat/dbcp/pool/impl/StackObjectPoolFactory.java
@@ -39,6 +39,7 @@ public class StackObjectPoolFactory<T> implements
ObjectPoolFactory<T> {
* @see StackObjectPool#StackObjectPool()
* @deprecated to be removed in pool 2.0 - use {@link
#StackObjectPoolFactory(PoolableObjectFactory)}
*/
+ @Deprecated
public StackObjectPoolFactory() {
this(null,StackObjectPool.DEFAULT_MAX_SLEEPING,StackObjectPool.DEFAULT_INIT_SLEEPING_CAPACITY);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
