From 2f66a54360d00c01b9feea092e2bc512814012f4 Mon Sep 17 00:00:00 2001 From: lancea Date: Tue, 9 Oct 2012 08:58:27 -0400 Subject: [PATCH] 7197395: Add @Deprecated to all deprecated methods to eliminate compiler warnings in JDBC Reviewed-by: alanb, smarks --- src/share/classes/com/sun/rowset/CachedRowSetImpl.java | 4 ++++ src/share/classes/com/sun/rowset/JdbcRowSetImpl.java | 4 ++++ src/share/classes/com/sun/rowset/JoinRowSetImpl.java | 4 ++++ .../com/sun/rowset/internal/SyncResolverImpl.java | 4 ++++ src/share/classes/java/sql/CallableStatement.java | 1 + src/share/classes/java/sql/Date.java | 7 +++++++ src/share/classes/java/sql/DriverManager.java | 6 ++++-- src/share/classes/java/sql/PreparedStatement.java | 3 ++- src/share/classes/java/sql/ResultSet.java | 10 ++++++++-- src/share/classes/javax/sql/rowset/BaseRowSet.java | 2 +- 10 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java index df6cbd077..e485ffb9b 100644 --- a/src/share/classes/com/sun/rowset/CachedRowSetImpl.java +++ b/src/share/classes/com/sun/rowset/CachedRowSetImpl.java @@ -2039,6 +2039,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * the cursor is not on a valid row, or this method fails * @deprecated */ + @Deprecated public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { Object value; BigDecimal bDecimal, retVal; @@ -2374,6 +2375,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * @throws SQLException if an error occurs * @deprecated */ + @Deprecated public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException { // always free an old stream unicodeStream = null; @@ -2643,6 +2645,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * @deprecated Use the getBigDecimal(String columnName) * method instead */ + @Deprecated public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException { return getBigDecimal(getColIdxByName(columnName), scale); } @@ -2774,6 +2777,7 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern * this rowset's rows or its insert row * @deprecated use the method getCharacterStream instead */ + @Deprecated public java.io.InputStream getUnicodeStream(String columnName) throws SQLException { return getUnicodeStream(getColIdxByName(columnName)); } diff --git a/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java b/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java index 36612ad80..8302c2922 100644 --- a/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java +++ b/src/share/classes/com/sun/rowset/JdbcRowSetImpl.java @@ -1016,6 +1016,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { * prepared statement, and result set * @deprecated */ + @Deprecated public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { checkState(); @@ -1154,6 +1155,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { * @deprecated use getCharacterStream in place of * getUnicodeStream */ + @Deprecated public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException { checkState(); @@ -1336,6 +1338,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { * prepared statement, and result set * @deprecated */ + @Deprecated public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException { return getBigDecimal(findColumn(columnName), scale); } @@ -1461,6 +1464,7 @@ public class JdbcRowSetImpl extends BaseRowSet implements JdbcRowSet, Joinable { * prepared statement, and result set * @deprecated */ + @Deprecated public java.io.InputStream getUnicodeStream(String columnName) throws SQLException { return getUnicodeStream(findColumn(columnName)); } diff --git a/src/share/classes/com/sun/rowset/JoinRowSetImpl.java b/src/share/classes/com/sun/rowset/JoinRowSetImpl.java index 0f712f994..4593794d9 100644 --- a/src/share/classes/com/sun/rowset/JoinRowSetImpl.java +++ b/src/share/classes/com/sun/rowset/JoinRowSetImpl.java @@ -1153,6 +1153,7 @@ public class JoinRowSetImpl extends WebRowSetImpl implements JoinRowSet { * the cursor is not on a valid row, or this method fails * @deprecated */ + @Deprecated public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { return crsInternal.getBigDecimal(columnIndex); } @@ -1264,6 +1265,7 @@ public class JoinRowSetImpl extends WebRowSetImpl implements JoinRowSet { * @throws SQLException if an error occurs * @deprecated */ + @Deprecated public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException { return crsInternal.getUnicodeStream(columnIndex); } @@ -1436,6 +1438,7 @@ public class JoinRowSetImpl extends WebRowSetImpl implements JoinRowSet { * @deprecated use the method getBigDecimal(String columnName) * instead */ + @Deprecated public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException { return crsInternal.getBigDecimal(columnName); } @@ -1552,6 +1555,7 @@ public class JoinRowSetImpl extends WebRowSetImpl implements JoinRowSet { * this rowset's rows or its insert row * @deprecated use the method getCharacterStream instead */ + @Deprecated public java.io.InputStream getUnicodeStream(String columnName) throws SQLException { return crsInternal.getUnicodeStream(columnName); } diff --git a/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java b/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java index 911b1d171..51654a8c8 100644 --- a/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java +++ b/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java @@ -1288,6 +1288,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * the cursor is not on a valid row, or this method fails * @deprecated */ + @Deprecated public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException { throw new UnsupportedOperationException(); } @@ -1424,6 +1425,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * @throws SQLException if an error occurs * @deprecated */ + @Deprecated public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException { throw new UnsupportedOperationException(); } @@ -1653,6 +1655,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * @deprecated Use the getBigDecimal(String columnName) * method instead */ + @Deprecated public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException { throw new UnsupportedOperationException(); } @@ -1784,6 +1787,7 @@ public class SyncResolverImpl extends CachedRowSetImpl implements SyncResolver { * this rowset's rows or its insert row * @deprecated use the method getCharacterStream instead */ + @Deprecated public java.io.InputStream getUnicodeStream(String columnName) throws SQLException { throw new UnsupportedOperationException(); } diff --git a/src/share/classes/java/sql/CallableStatement.java b/src/share/classes/java/sql/CallableStatement.java index 460b02858..2813b6cc2 100644 --- a/src/share/classes/java/sql/CallableStatement.java +++ b/src/share/classes/java/sql/CallableStatement.java @@ -295,6 +295,7 @@ public interface CallableStatement extends PreparedStatement { * or getBigDecimal(String parameterName) * @see #setBigDecimal */ + @Deprecated BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException; diff --git a/src/share/classes/java/sql/Date.java b/src/share/classes/java/sql/Date.java index de39d1485..5d6cd6baf 100644 --- a/src/share/classes/java/sql/Date.java +++ b/src/share/classes/java/sql/Date.java @@ -51,6 +51,7 @@ public class Date extends java.util.Date { * @param day 1 to 31 * @deprecated instead use the constructor Date(long date) */ + @Deprecated public Date(int year, int month, int day) { super(year, month, day); } @@ -179,6 +180,7 @@ public class Date extends java.util.Date { * @exception java.lang.IllegalArgumentException if this method is invoked * @see #setHours */ + @Deprecated public int getHours() { throw new java.lang.IllegalArgumentException(); } @@ -191,6 +193,7 @@ public class Date extends java.util.Date { * @exception java.lang.IllegalArgumentException if this method is invoked * @see #setMinutes */ + @Deprecated public int getMinutes() { throw new java.lang.IllegalArgumentException(); } @@ -203,6 +206,7 @@ public class Date extends java.util.Date { * @exception java.lang.IllegalArgumentException if this method is invoked * @see #setSeconds */ + @Deprecated public int getSeconds() { throw new java.lang.IllegalArgumentException(); } @@ -215,6 +219,7 @@ public class Date extends java.util.Date { * @exception java.lang.IllegalArgumentException if this method is invoked * @see #getHours */ + @Deprecated public void setHours(int i) { throw new java.lang.IllegalArgumentException(); } @@ -227,6 +232,7 @@ public class Date extends java.util.Date { * @exception java.lang.IllegalArgumentException if this method is invoked * @see #getMinutes */ + @Deprecated public void setMinutes(int i) { throw new java.lang.IllegalArgumentException(); } @@ -239,6 +245,7 @@ public class Date extends java.util.Date { * @exception java.lang.IllegalArgumentException if this method is invoked * @see #getSeconds */ + @Deprecated public void setSeconds(int i) { throw new java.lang.IllegalArgumentException(); } diff --git a/src/share/classes/java/sql/DriverManager.java b/src/share/classes/java/sql/DriverManager.java index 819544a15..fd544a7ff 100644 --- a/src/share/classes/java/sql/DriverManager.java +++ b/src/share/classes/java/sql/DriverManager.java @@ -412,13 +412,14 @@ public class DriverManager { * method throws a java.lang.SecurityException. * * @param out the new logging/tracing PrintStream; to disable, set to null - * @deprecated + * @deprecated Use {@code setLogWriter) * @throws SecurityException if a security manager exists and its * checkPermission method denies setting the log stream * * @see SecurityManager#checkPermission * @see #getLogStream */ + @Deprecated public static void setLogStream(java.io.PrintStream out) { SecurityManager sec = System.getSecurityManager(); @@ -438,9 +439,10 @@ public class DriverManager { * and all drivers. * * @return the logging/tracing PrintStream; if disabled, is null - * @deprecated + * @deprecated Use {@code getLogWriter) * @see #setLogStream */ + @Deprecated public static java.io.PrintStream getLogStream() { return logStream; } diff --git a/src/share/classes/java/sql/PreparedStatement.java b/src/share/classes/java/sql/PreparedStatement.java index 8d6ca6036..d67505f4f 100644 --- a/src/share/classes/java/sql/PreparedStatement.java +++ b/src/share/classes/java/sql/PreparedStatement.java @@ -342,8 +342,9 @@ public interface PreparedStatement extends Statement { * this method is called on a closed PreparedStatement * @exception SQLFeatureNotSupportedException if the JDBC driver does not support * this method - * @deprecated + * @deprecated Use {@code setCharacterStream} */ + @Deprecated void setUnicodeStream(int parameterIndex, java.io.InputStream x, int length) throws SQLException; diff --git a/src/share/classes/java/sql/ResultSet.java b/src/share/classes/java/sql/ResultSet.java index fc4dbf6b4..3904a2ed6 100644 --- a/src/share/classes/java/sql/ResultSet.java +++ b/src/share/classes/java/sql/ResultSet.java @@ -356,8 +356,10 @@ public interface ResultSet extends Wrapper, AutoCloseable { * called on a closed result set * @exception SQLFeatureNotSupportedException if the JDBC driver does not support * this method - * @deprecated + * @deprecated Use {@code getBigDecimal(int columnIndex)} + * or {@code getBigDecimal(String columnLabel)} */ + @Deprecated BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException; /** @@ -477,6 +479,7 @@ public interface ResultSet extends Wrapper, AutoCloseable { * @deprecated use getCharacterStream in place of * getUnicodeStream */ + @Deprecated java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException; /** @@ -641,8 +644,10 @@ public interface ResultSet extends Wrapper, AutoCloseable { * called on a closed result set * @exception SQLFeatureNotSupportedException if the JDBC driver does not support * this method - * @deprecated + * @deprecated Use {@code getBigDecimal(int columnIndex)} + * or {@code getBigDecimal(String columnLabel)} */ + @Deprecated BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException; /** @@ -760,6 +765,7 @@ public interface ResultSet extends Wrapper, AutoCloseable { * this method * @deprecated use getCharacterStream instead */ + @Deprecated java.io.InputStream getUnicodeStream(String columnLabel) throws SQLException; /** diff --git a/src/share/classes/javax/sql/rowset/BaseRowSet.java b/src/share/classes/javax/sql/rowset/BaseRowSet.java index bbb1852b9..b057cf686 100644 --- a/src/share/classes/javax/sql/rowset/BaseRowSet.java +++ b/src/share/classes/javax/sql/rowset/BaseRowSet.java @@ -2389,7 +2389,7 @@ public abstract class BaseRowSet implements Serializable, Cloneable { * @deprecated getCharacterStream should be used in its place * @see #getParams */ - + @Deprecated public void setUnicodeStream(int parameterIndex, java.io.InputStream x, int length) throws SQLException { Object unicodeStream[]; checkParamIndex(parameterIndex); -- GitLab