Skip to content

Commit

Permalink
DERBY-5840: Update JDBC 3.0 stubs for Java 5
Browse files Browse the repository at this point in the history
Some JDBC signatures were changed to generics between 1.4.2 and 1.5.0.
Update the stubs so that we get the same results when we compile against
the stubs as when we compile against Java 5 class libraries.

git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1362464 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
kahatlen committed Jul 17, 2012
1 parent c784df5 commit 44a867f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build.xml
Expand Up @@ -812,8 +812,8 @@
<mkdir dir="${out.jdbc3.dir}"/>

<javac
source="1.4"
target="1.4"
source="1.5"
target="1.5"
bootclasspath="${empty}"
nowarn="on"
debug="${debug}"
Expand Down
4 changes: 2 additions & 2 deletions java/stubs/jdbc3/java/sql/CallableStatement.java
Expand Up @@ -446,7 +446,7 @@ public BigDecimal getBigDecimal(int parameterIndex, int scale)
* @throws SQLException
* if a database error happens
*/
public Object getObject(int parameterIndex, Map map)
public Object getObject(int parameterIndex, Map<String, Class<?>> map)
throws SQLException;

/**
Expand Down Expand Up @@ -478,7 +478,7 @@ public Object getObject(int parameterIndex, Map map)
* @throws SQLException
* if there is a problem accessing the database
*/
public Object getObject(String parameterName, Map map)
public Object getObject(String parameterName, Map<String, Class<?>> map)
throws SQLException;

/**
Expand Down
4 changes: 2 additions & 2 deletions java/stubs/jdbc3/java/sql/Connection.java
Expand Up @@ -252,7 +252,7 @@ public Statement createStatement(int resultSetType,
* @throws SQLException
* if there is a problem accessing the database
*/
public Map getTypeMap() throws SQLException;
public Map<String, Class<?>> getTypeMap() throws SQLException;

/**
* Gets the first instance of any <code>SQLWarning</code> objects that may
Expand Down Expand Up @@ -755,5 +755,5 @@ public PreparedStatement prepareStatement(String sql, String[] columnNames)
* if there is a problem accessing the database or if
* <code>map</code> is not an instance of {@link Map}.
*/
public void setTypeMap(Map map) throws SQLException;
public void setTypeMap(Map<String, Class<?>> map) throws SQLException;
}
2 changes: 1 addition & 1 deletion java/stubs/jdbc3/java/sql/DriverManager.java
Expand Up @@ -50,7 +50,7 @@ public class DriverManager {
* Set to hold Registered Drivers - initial capacity 10 drivers (will expand
* automatically if necessary.
*/
private static final List theDrivers = new ArrayList(10);
private static final List<Driver> theDrivers = new ArrayList<Driver>(10);

// Permission for setting log
private static final SQLPermission logPermission = null;
Expand Down

0 comments on commit 44a867f

Please sign in to comment.