Revised SqlRowSet javadoc and support for JDBC 4.x ResultSet additions

Issue: SPR-12476
Issue: SPR-12480

Author: jhoeller

spring-jdbc/src/main/java/org/springframework/jdbc/support/rowset/ResultSetWrappingSqlRowSet.java

@@ -221,46 +221,47 @@ public byte getByte(String columnLabel) throws InvalidResultSetAccessException {
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getDate(int, java.util.Calendar)
+	 * @see java.sql.ResultSet#getDate(int)
 	 */
 	@Override
-	public Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
+	public Date getDate(int columnIndex) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getDate(columnIndex, cal);
+			return this.resultSet.getDate(columnIndex);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getDate(int)
+	 * @see java.sql.ResultSet#getDate(String)
 	 */
 	@Override
-	public Date getDate(int columnIndex) throws InvalidResultSetAccessException {
+	public Date getDate(String columnLabel) throws InvalidResultSetAccessException {
+		return getDate(findColumn(columnLabel));
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getDate(int, Calendar)
+	 */
+	@Override
+	public Date getDate(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getDate(columnIndex);
+			return this.resultSet.getDate(columnIndex, cal);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
+
 	/**
-	 * @see java.sql.ResultSet#getDate(String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getDate(String, Calendar)
 	 */
 	@Override
 	public Date getDate(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
 		return getDate(findColumn(columnLabel), cal);
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getDate(String)
-	 */
-	@Override
-	public Date getDate(String columnLabel) throws InvalidResultSetAccessException {
-		return getDate(findColumn(columnLabel));
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getDouble(int)
 	 */
@@ -302,6 +303,7 @@ public float getFloat(int columnIndex) throws InvalidResultSetAccessException {
 	public float getFloat(String columnLabel) throws InvalidResultSetAccessException {
 		return getFloat(findColumn(columnLabel));
 	}
+
 	/**
 	 * @see java.sql.ResultSet#getInt(int)
 	 */
@@ -345,18 +347,26 @@ public long getLong(String columnLabel) throws InvalidResultSetAccessException {
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getObject(int, java.util.Map)
+	 * @see java.sql.ResultSet#getNString(int)
 	 */
 	@Override
-	public Object getObject(int i,  Map<String, Class<?>> map) throws InvalidResultSetAccessException {
+	public String getNString(int columnIndex) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getObject(i, map);
+			return this.resultSet.getNString(columnIndex);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
 
+	/**
+	 * @see java.sql.ResultSet#getNString(String)
+	 */
+	@Override
+	public String getNString(String columnLabel) throws InvalidResultSetAccessException {
+		return getNString(findColumn(columnLabel));
+	}
+
 	/**
 	 * @see java.sql.ResultSet#getObject(int)
 	 */
@@ -371,19 +381,53 @@ public Object getObject(int columnIndex) throws InvalidResultSetAccessException
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getObject(String, java.util.Map)
+	 * @see java.sql.ResultSet#getObject(String)
 	 */
 	@Override
-	public Object getObject(String columnLabel,  Map<String, Class<?>> map) throws InvalidResultSetAccessException {
+	public Object getObject(String columnLabel) throws InvalidResultSetAccessException {
+		return getObject(findColumn(columnLabel));
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getObject(int, Map)
+	 */
+	@Override
+	public Object getObject(int columnIndex, Map<String, Class<?>> map) throws InvalidResultSetAccessException {
+		try {
+			return this.resultSet.getObject(columnIndex, map);
+		}
+		catch (SQLException se) {
+			throw new InvalidResultSetAccessException(se);
+		}
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getObject(String, Map)
+	 */
+	@Override
+	public Object getObject(String columnLabel, Map<String, Class<?>> map) throws InvalidResultSetAccessException {
 		return getObject(findColumn(columnLabel), map);
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getObject(String)
+	 * @see java.sql.ResultSet#getObject(int, Class)
 	 */
 	@Override
-	public Object getObject(String columnLabel) throws InvalidResultSetAccessException {
-		return getObject(findColumn(columnLabel));
+	public <T> T getObject(int columnIndex, Class<T> type) throws InvalidResultSetAccessException {
+		try {
+			return this.resultSet.getObject(columnIndex, type);
+		}
+		catch (SQLException se) {
+			throw new InvalidResultSetAccessException(se);
+		}
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getObject(String, Class)
+	 */
+	@Override
+	public <T> T getObject(String columnLabel, Class<T> type) throws InvalidResultSetAccessException {
+		return getObject(findColumn(columnLabel), type);
 	}
 
 	/**
@@ -428,19 +472,6 @@ public String getString(String columnLabel) throws InvalidResultSetAccessExcepti
 		return getString(findColumn(columnLabel));
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getTime(int, java.util.Calendar)
-	 */
-	@Override
-	public Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
-		try {
-			return this.resultSet.getTime(columnIndex, cal);
-		}
-		catch (SQLException se) {
-			throw new InvalidResultSetAccessException(se);
-		}
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getTime(int)
 	 */
@@ -454,14 +485,6 @@ public Time getTime(int columnIndex) throws InvalidResultSetAccessException {
 		}
 	}
 
-	/**
-	 * @see java.sql.ResultSet#getTime(String, java.util.Calendar)
-	 */
-	@Override
-	public Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
-		return getTime(findColumn(columnLabel), cal);
-	}
-
 	/**
 	 * @see java.sql.ResultSet#getTime(String)
 	 */
@@ -471,18 +494,26 @@ public Time getTime(String columnLabel) throws InvalidResultSetAccessException {
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getTimestamp(int, java.util.Calendar)
+	 * @see java.sql.ResultSet#getTime(int, Calendar)
 	 */
 	@Override
-	public Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
+	public Time getTime(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
 		try {
-			return this.resultSet.getTimestamp(columnIndex, cal);
+			return this.resultSet.getTime(columnIndex, cal);
 		}
 		catch (SQLException se) {
 			throw new InvalidResultSetAccessException(se);
 		}
 	}
 
+	/**
+	 * @see java.sql.ResultSet#getTime(String, Calendar)
+	 */
+	@Override
+	public Time getTime(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
+		return getTime(findColumn(columnLabel), cal);
+	}
+
 	/**
 	 * @see java.sql.ResultSet#getTimestamp(int)
 	 */
@@ -497,19 +528,32 @@ public Timestamp getTimestamp(int columnIndex) throws InvalidResultSetAccessExce
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getTimestamp(String, java.util.Calendar)
+	 * @see java.sql.ResultSet#getTimestamp(String)
 	 */
 	@Override
-	public Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
-		return getTimestamp(findColumn(columnLabel), cal);
+	public Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException {
+		return getTimestamp(findColumn(columnLabel));
 	}
 
 	/**
-	 * @see java.sql.ResultSet#getTimestamp(String)
+	 * @see java.sql.ResultSet#getTimestamp(int, Calendar)
 	 */
 	@Override
-	public Timestamp getTimestamp(String columnLabel) throws InvalidResultSetAccessException {
-		return getTimestamp(findColumn(columnLabel));
+	public Timestamp getTimestamp(int columnIndex, Calendar cal) throws InvalidResultSetAccessException {
+		try {
+			return this.resultSet.getTimestamp(columnIndex, cal);
+		}
+		catch (SQLException se) {
+			throw new InvalidResultSetAccessException(se);
+		}
+	}
+
+	/**
+	 * @see java.sql.ResultSet#getTimestamp(String, Calendar)
+	 */
+	@Override
+	public Timestamp getTimestamp(String columnLabel, Calendar cal) throws InvalidResultSetAccessException {
+		return getTimestamp(findColumn(columnLabel), cal);
 	}