From 44a867f867a2eef04dd70a72402cbb7a7b4b12d1 Mon Sep 17 00:00:00 2001
From: Knut Anders Hatlen <kahatlen@apache.org>
Date: Tue, 17 Jul 2012 12:13:47 +0000
Subject: [PATCH] DERBY-5840: Update JDBC 3.0 stubs for Java 5

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
---
 build.xml                                        | 4 ++--
 java/stubs/jdbc3/java/sql/CallableStatement.java | 4 ++--
 java/stubs/jdbc3/java/sql/Connection.java        | 4 ++--
 java/stubs/jdbc3/java/sql/DriverManager.java     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 949bd4c5e0..ff2f3bd04c 100644
--- a/build.xml
+++ b/build.xml
@@ -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}"
diff --git a/java/stubs/jdbc3/java/sql/CallableStatement.java b/java/stubs/jdbc3/java/sql/CallableStatement.java
index 6d378dc18e..5aba059b63 100644
--- a/java/stubs/jdbc3/java/sql/CallableStatement.java
+++ b/java/stubs/jdbc3/java/sql/CallableStatement.java
@@ -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;
 
     /**
@@ -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;
 
     /**
diff --git a/java/stubs/jdbc3/java/sql/Connection.java b/java/stubs/jdbc3/java/sql/Connection.java
index ce66361a4c..4683299b16 100644
--- a/java/stubs/jdbc3/java/sql/Connection.java
+++ b/java/stubs/jdbc3/java/sql/Connection.java
@@ -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
@@ -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;
 }
diff --git a/java/stubs/jdbc3/java/sql/DriverManager.java b/java/stubs/jdbc3/java/sql/DriverManager.java
index f68faf900b..bff70d1f34 100644
--- a/java/stubs/jdbc3/java/sql/DriverManager.java
+++ b/java/stubs/jdbc3/java/sql/DriverManager.java
@@ -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;