db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1483202 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: jdbcapi/ upgradeTests/ upgradeTests/helpers/
Date Thu, 16 May 2013 06:34:59 GMT
Author: kahatlen
Date: Thu May 16 06:34:59 2013
New Revision: 1483202

URL: http://svn.apache.org/r1483202
Log:
DERBY-5840: Clean up compiler warnings introduced by using Java 5 language features

Clean up warnings in jdbcapi test suite, and some classes that the
jdbcapi tests depend on in the upgrade test suite.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AuthenticationTest.java Thu May 16 06:34:59 2013
@@ -1217,7 +1217,7 @@ public class AuthenticationTest extends 
                       getDatabaseProperty(BUILTIN_ALGO_PROP));
 
         // Store a set of generated password tokens to detect collisions
-        HashSet tokens = new HashSet();
+        HashSet<String> tokens = new HashSet<String>();
 
         for (int i = 0; i < USERS.length; i++) {
             String user = USERS[i];

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ClosedObjectTest.java Thu May 16 06:34:59 2013
@@ -140,7 +140,7 @@ public class ClosedObjectTest extends Ba
     private boolean isImplemented() throws NoSuchMethodException {
         // Check if the method is implemented in one of the Derby classes
         // that the JDBC object belongs to.
-        for (Class c = decorator_.getClosedObject().getClass();
+        for (Class<?> c = decorator_.getClosedObject().getClass();
                 c != null; c = c.getSuperclass()) {
             if (c.getName().startsWith("org.apache.derby.")) {
                 try {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrentAutoloadTest.java Thu May 16 06:34:59 2013
@@ -59,7 +59,8 @@ public class ConcurrentAutoloadTest exte
         final String user = tc.getUserName();
         final String pw = tc.getUserPassword();
 
-        final List errors = Collections.synchronizedList(new ArrayList());
+        final List<Throwable> errors =
+                Collections.synchronizedList(new ArrayList<Throwable>());
 
         Runnable r = new Runnable() {
             public void run() {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DSCreateShutdownDBTest.java Thu May 16 06:34:59 2013
@@ -19,9 +19,7 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
-import java.io.File;
 import java.lang.reflect.Method;
-import java.security.AccessController;
 import java.sql.SQLException;
 
 import javax.sql.DataSource;
@@ -32,7 +30,6 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.TestConfiguration;
 
@@ -81,62 +78,11 @@ public class DSCreateShutdownDBTest exte
         // attempt to get rid of any databases. 
         // only 5 dbs (in addition to defaultdb) should actually get
         // created, but just in case, try all...
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < ADDITIONAL_DBS.length ; i++)
-                {   
-                    removeDatabase("emb" + ADDITIONAL_DBS[i]);
-                    removeDatabase("srv" + ADDITIONAL_DBS[i]);
-                } 
-                return null;
-            }
-            
-            void removeDatabase(String dbName)
-            {
-                //TestConfiguration config = TestConfiguration.getCurrent();
-                dbName = dbName.replace('/', File.separatorChar);
-                String dsh = BaseTestCase.getSystemProperty("derby.system.home");
-                if (dsh == null) {
-                    fail("not implemented");
-                } else {
-                    dbName = dsh + File.separator + dbName;
-                }
-                removeDirectory(dbName);
-            }
-
-            void removeDirectory(String path)
-            {
-                final File dir = new File(path);
-                removeDir(dir);
-            }
-
-            private void removeDir(File dir) {
-                
-                // Check if anything to do!
-                // Database may not have been created.
-                if (!dir.exists())
-                    return;
-
-                String[] list = dir.list();
-
-                // Some JVMs return null for File.list() when the
-                // directory is empty.
-                if (list != null) {
-                    for (int i = 0; i < list.length; i++) {
-                        File entry = new File(dir, list[i]);
-
-                        if (entry.isDirectory()) {
-                            removeDir(entry);
-                        } else {
-                            entry.delete();
-                            //assertTrue(entry.getPath(), entry.delete());
-                        }
-                    }
-                }
-                dir.delete();
-                //assertTrue(dir.getPath(), dir.delete());
-            }
-        });
+        TestConfiguration conf = TestConfiguration.getCurrent();
+        for (int i = 0; i < ADDITIONAL_DBS.length; i++) {
+            removeDirectory(conf.getDatabasePath("emb" + ADDITIONAL_DBS[i]));
+            removeDirectory(conf.getDatabasePath("srv" + ADDITIONAL_DBS[i]));
+        }
         super.tearDown();
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceReferenceTest.java Thu May 16 06:34:59 2013
@@ -447,7 +447,7 @@ public class DataSourceReferenceTest
      */
     private static String[] getPropertyBeanList(Object ds) {
         Method[] allMethods = ds.getClass().getMethods();
-        ArrayList properties = new ArrayList();
+        ArrayList<String> properties = new ArrayList<String>();
 
         for (int i = 0; i < allMethods.length; i++) {
             Method method = allMethods[i];
@@ -477,7 +477,7 @@ public class DataSourceReferenceTest
             }
         }
 
-        return (String[])properties.toArray(new String[properties.size()]);
+        return properties.toArray(new String[properties.size()]);
     }
 
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceSerializationTest.java Thu May 16 06:34:59 2013
@@ -238,9 +238,9 @@ public class DataSourceSerializationTest
         // De-serialize the data source.
         InputStream is;
         try {
-            is = (FileInputStream)AccessController.doPrivileged(
-                  new PrivilegedExceptionAction() {
-                public Object run() throws FileNotFoundException {
+            is = AccessController.doPrivileged(
+                  new PrivilegedExceptionAction<InputStream>() {
+                public InputStream run() throws FileNotFoundException {
                     return new FileInputStream(
                             SupportFilesSetup.getReadOnly(fname.toString()));
                 }

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DataSourceTest.java Thu May 16 06:34:59 2013
@@ -22,7 +22,6 @@
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
 import java.io.File;
-import java.security.AccessController;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -34,6 +33,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.derby.jdbc.ClientDataSourceInterface;
 import org.apache.derby.jdbc.BasicEmbeddedDataSource40;
+import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.functionTests.util.SecurityCheck;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
@@ -65,7 +65,8 @@ public class DataSourceTest extends Base
      * the connections are closed when we are done, so they are stored
      * in this hashtable
      */
-    protected static Hashtable conns = new Hashtable();
+    protected static Hashtable<String, Connection> conns =
+            new Hashtable<String, Connection>();
     
     /** The expected format of a connection string. In English:
      * "<classname>@<hashcode> (XID=<xid>), (SESSION = <sessionid>),
@@ -161,21 +162,14 @@ public class DataSourceTest extends Base
     
     public void tearDown() throws Exception {
         // attempt to get rid of any left-over trace files
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < 6 ; i++)
-                {   
-                    String traceFileName = "trace" + (i+1) + ".out";
-                    File traceFile = new File(traceFileName);
-                    if (traceFile.exists())
-                    {
-                        // if it exists, attempt to get rid of it
-                        traceFile.delete();
-                    }
-                } 
-                return null;
+        for (int i = 0; i < 6; i++) {
+            String traceFileName = "trace" + (i + 1) + ".out";
+            File traceFile = new File(traceFileName);
+            if (PrivilegedFileOpsForTests.exists(traceFile)) {
+                // if it exists, attempt to get rid of it
+                PrivilegedFileOpsForTests.delete(traceFile);
             }
-        });
+        }
         super.tearDown();
     }
 
@@ -396,22 +390,11 @@ public class DataSourceTest extends Base
      */
     private static void assertTraceFilesExist() 
     {
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < 2 ; i++)
-                {   
-                    String traceFileName = "trace" + (i+1) + ".out";
-                    File traceFile = new File(traceFileName);
-                    if (i == 2)
-                        continue;
-                    else
-                    {
-                        assertTrue(traceFile.exists());
-                    }
-                } 
-                return null;
-            }
-        });
+        for (int i = 0; i < 2; i++) {
+            String traceFileName = "trace" + (i + 1) + ".out";
+            File traceFile = new File(traceFileName);
+            assertTrue(PrivilegedFileOpsForTests.exists(traceFile));
+        }
     }
 
     /**
@@ -783,10 +766,7 @@ public class DataSourceTest extends Base
      */
     private static void clearConnections() throws SQLException
     {
-        java.util.Iterator it = conns.values().iterator();
-        while ( it.hasNext() )
-        {
-            Connection conn = (Connection)it.next();
+        for (Connection conn : conns.values()) {
             conn.close();
         }
         conns.clear();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Thu May 16 06:34:59 2013
@@ -44,7 +44,6 @@ import java.util.Arrays;
 //import java.util.HashMap;
 //import java.util.Iterator;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
@@ -742,25 +741,21 @@ public class DatabaseMetaDataTest extend
         // DERBY-4886: Embedded returns the URL without connection attributes,
         // client returns the URL with connection attributes.
         if (usingDerbyNetClient()) {
-            String[] urlComponents = url.split(";");
+            List<String> urlComponents = Arrays.asList(url.split(";"));
 
             // Only compare whatever comes before the first semi-colon with
             // the expected URL. Check connection attributes separately.
-            url = urlComponents[0];
+            url = urlComponents.get(0);
 
             // Put each actual connection attribute in a HashSet for easy
             // comparison.
-            HashSet attrs = new HashSet();
-            for (int i = 1; i < urlComponents.length; i++) {
-                attrs.add(urlComponents[i]);
-            }
+            HashSet<String> attrs = new HashSet<String>(
+                    urlComponents.subList(1, urlComponents.size()));
 
             // Put each expected connection attribute in a HashSet.
-            HashSet expectedAttrs = new HashSet();
+            HashSet<String> expectedAttrs = new HashSet<String>();
             Properties ca = config.getConnectionAttributes();
-            Enumeration e = ca.propertyNames();
-            while (e.hasMoreElements()) {
-                String key = (String) e.nextElement();
+            for (String key : ca.stringPropertyNames()) {
                 expectedAttrs.add(key + '=' + ca.getProperty(key));
             }
 
@@ -1478,7 +1473,7 @@ public class DatabaseMetaDataTest extend
     private int createTablesForTest(boolean skipXML) throws Exception
     {
         getConnection().setAutoCommit(false);
-        List types = getSQLTypes(getConnection());
+        List<String> types = getSQLTypes(getConnection());
         if (skipXML)
             types.remove("XML");
             
@@ -2158,7 +2153,7 @@ public class DatabaseMetaDataTest extend
 	 Derby-2258 Removed 3 data types which are not supported by Derby
 	 and added XML data type which is supported by Derby
 	*/
-        int[] allTypes = new int[] {
+        List<Integer> supportedTypes = new ArrayList<Integer>(Arrays.asList(
           Types.BIGINT, Types.BINARY, Types.BLOB, Types.BOOLEAN,
           Types.CHAR, Types.CLOB, Types.DATE,
           Types.DECIMAL, Types.DOUBLE, Types.FLOAT,
@@ -2166,12 +2161,7 @@ public class DatabaseMetaDataTest extend
           Types.NUMERIC, Types.REAL, Types.SMALLINT,
           Types.TIME, Types.TIMESTAMP,  Types.VARBINARY,
           Types.VARCHAR, JDBC.SQLXML, Types.JAVA_OBJECT
-        };
-
-        ArrayList supportedTypes = new ArrayList();
-        for (int i = 0; i < allTypes.length; i++) {
-            supportedTypes.add(new Integer(allTypes[i]));
-        }
+        ));
 
         Version dataVersion = getDataVersion(getConnection());
         boolean booleanSupported =
@@ -2767,9 +2757,9 @@ public class DatabaseMetaDataTest extend
      * expected. For variable sized types the string will
      * have random valid length information. E.g. CHAR(37).
      */
-    public static List getSQLTypes(Connection conn) throws SQLException
+    public static List<String> getSQLTypes(Connection conn) throws SQLException
     {
-        List list = new ArrayList();
+        List<String> list = new ArrayList<String>();
         
         Random rand = new Random();
         
@@ -4625,7 +4615,8 @@ public class DatabaseMetaDataTest extend
             jdbcRow[14] = jdbcRow[15] = null;
 
             // ODBC variant lacks column #20 (SPECIFIC_NAME)...
-            ArrayList odbcRow = new ArrayList(Arrays.asList(row));
+            ArrayList<Object> odbcRow =
+                    new ArrayList<Object>(Arrays.asList(row));
             odbcRow.remove(19);
             // ... and it is a bit different in the datetime rows
             if (i == 9) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DriverTest.java Thu May 16 06:34:59 2013
@@ -22,7 +22,6 @@ limitations under the License.
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
 import java.io.File;
-import java.security.AccessController;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.Driver;
@@ -31,8 +30,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.TestConfiguration;
@@ -122,73 +121,20 @@ public class DriverTest extends BaseJDBC
 
     public void tearDown() throws Exception {
         // attempt to get rid of any left-over trace files
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < 2 ; i++)
-                {   
-                    String traceFileName = "trace" + (i+1) + ".out";
-                    File traceFile = new File(traceFileName);
-                    if (traceFile.exists())
-                    {
-                        // if it exists, attempt to get rid of it
-                        traceFile.delete();
-                    }
-                } 
-                removeDatabases();
-                return null;
-            }
-            
-            // attempt to get rid of any databases. 
-            void removeDatabases()
-            {
-                for ( int i=0 ; i<ADDITIONAL_DBS.length ; i++)
-                {
-                    String dbName = ADDITIONAL_DBS[i];
-                    //TestConfiguration config = TestConfiguration.getCurrent();
-                    dbName = dbName.replace('/', File.separatorChar);
-                    String dsh = BaseTestCase.getSystemProperty("derby.system.home");
-                    if (dsh == null) {
-                        fail("not implemented");
-                    } else {
-                        dbName = dsh + File.separator + dbName;
-                    }
-                    removeDirectory(dbName);
-                }
-            }
-
-            void removeDirectory(String path)
-            {
-                final File dir = new File(path);
-                removeDir(dir);
+        for (int i = 0; i < 2; i++) {
+            String traceFileName = "trace" + (i + 1) + ".out";
+            File traceFile = new File(traceFileName);
+            if (PrivilegedFileOpsForTests.exists(traceFile)) {
+                // if it exists, attempt to get rid of it
+                PrivilegedFileOpsForTests.delete(traceFile);
             }
+        }
 
-            private void removeDir(File dir) {
+        TestConfiguration config = TestConfiguration.getCurrent();
+        for (String dbName : ADDITIONAL_DBS) {
+            removeDirectory(config.getDatabasePath(dbName));
+        }
 
-                // Check if anything to do!
-                // Database may not have been created.
-                if (!dir.exists())
-                    return;
-
-                String[] list = dir.list();
-
-                // Some JVMs return null for File.list() when the
-                // directory is empty.
-                if (list != null) {
-                    for (int i = 0; i < list.length; i++) {
-                        File entry = new File(dir, list[i]);
-
-                        if (entry.isDirectory()) {
-                            removeDir(entry);
-                        } else {
-                            entry.delete();
-                            //assertTrue(entry.getPath(), entry.delete());
-                        }
-                    }
-                }
-                dir.delete();
-                //assertTrue(dir.getPath(), dir.delete());
-            }
-        });
         super.tearDown();
     }
     
@@ -421,20 +367,11 @@ public class DriverTest extends BaseJDBC
      */
     private static void assertTraceFilesExist() 
     {
-        
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < 2 ; i++)
-                {   
-                    String traceFileName = "trace" + (i+1) + ".out";
-                    File traceFile = new File(traceFileName);
-                    //System.out.println("user.dir=" + System.getProperty("user.dir"));
-                    //System.out.println("fullpath = " + traceFile.getAbsolutePath());
-                        assertTrue(traceFile.exists());
-                } 
-                return null;
-            }
-        });
+        for (int i = 0; i < 2; i++) {
+            String traceFileName = "trace" + (i + 1) + ".out";
+            File traceFile = new File(traceFileName);
+            assertTrue(PrivilegedFileOpsForTests.exists(traceFile));
+        }
     }
 
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/InternationalConnectTest.java Thu May 16 06:34:59 2013
@@ -55,7 +55,7 @@ public class InternationalConnectTest ex
      */
    
     /* Keep track of the databases created in the fixtures to cleanup in tearDown() */
-    private ArrayList databasesForCleanup;
+    private ArrayList<String> databasesForCleanup;
     
     /**
      * @param name
@@ -63,7 +63,7 @@ public class InternationalConnectTest ex
     public InternationalConnectTest(String name) {
         super(name);
         
-        databasesForCleanup = new ArrayList();
+        databasesForCleanup = new ArrayList<String>();
     }
 
     public void testBoundaries() throws SQLException, UnsupportedEncodingException {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java Thu May 16 06:34:59 2013
@@ -25,7 +25,6 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
-import java.security.AccessController;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -36,8 +35,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Savepoint;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.Map;
 
 import javax.sql.ConnectionEvent;
 import javax.sql.ConnectionEventListener;
@@ -92,7 +94,8 @@ public class J2EEDataSourceTest extends 
      * the connections are closed when we are done, so they are stored
      * in this hashtable
      */
-    protected static Hashtable conns = new Hashtable();
+    protected static Hashtable<String, Connection> conns =
+            new Hashtable<String, Connection>();
     
     /** The expected format of a connection string. In English:
      * "<classname>@<hashcode> (XID=<xid>), (SESSION = <sessionid>),
@@ -266,21 +269,14 @@ public class J2EEDataSourceTest extends 
     
     public void tearDown() throws Exception {
         // attempt to get rid of any left-over trace files
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < 6 ; i++)
-                {   
-                    String traceFileName = "trace" + (i+1) + ".out";
-                    File traceFile = new File(traceFileName);
-                    if (traceFile.exists())
-                    {
-                        // if it exists, attempt to get rid of it
-                        traceFile.delete();
-                    }
-                } 
-                return null;
+        for (int i = 0; i < 6; i++) {
+            String traceFileName = "trace" + (i + 1) + ".out";
+            File traceFile = new File(traceFileName);
+            if (PrivilegedFileOpsForTests.exists(traceFile)) {
+                // if it exists, attempt to get rid of it
+                PrivilegedFileOpsForTests.delete(traceFile);
             }
-        });
+        }
         super.tearDown();
     }
 
@@ -3024,16 +3020,13 @@ public class J2EEDataSourceTest extends 
      */
     private static void assertTraceFilesExistAndCanBeDeleted()
     {
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=3 ; i <= 6 ; i++) {
-                    File traceFile = new File("trace" + i + ".out");
-                    assertTrue("Doesn't exist", traceFile.exists());
-                    assertTrue("Delete failed", traceFile.delete());
-                } 
-                return null;
-            }
-        });
+        for (int i = 3; i <= 6; i++) {
+            File traceFile = new File("trace" + i + ".out");
+            assertTrue("Doesn't exist",
+                    PrivilegedFileOpsForTests.exists(traceFile));
+            assertTrue("Delete failed",
+                    PrivilegedFileOpsForTests.delete(traceFile));
+        }
     }
 
     /**
@@ -4181,7 +4174,8 @@ public class J2EEDataSourceTest extends 
 
         // Derby-33 - setTypeMap on connection
         try {
-            conn.setTypeMap(java.util.Collections.EMPTY_MAP);
+            Map<String, Class<?>> empty = Collections.emptyMap();
+            conn.setTypeMap(empty);
             if (!((String)expectedValues[5]).equals("OK"))
                 fail (" expected an sqlexception on setTypeMap(EMPTY_MAP)");
         } catch (SQLException sqle) {
@@ -4200,8 +4194,8 @@ public class J2EEDataSourceTest extends 
         }
         try {
             // a populated map, not implemented
-            java.util.Map map = new java.util.HashMap();
-            map.put("name", "class");
+            Map<String, Class<?>> map = new HashMap<String, Class<?>>();
+            map.put("name", Class.class);
             conn.setTypeMap(map);
             if (!((String)expectedValues[7]).equals("OK"))
                 fail (" expected an sqlexception on setTypeMap(map)");
@@ -4417,10 +4411,7 @@ public class J2EEDataSourceTest extends 
      */
     private static void clearConnections() throws SQLException
     {
-        java.util.Iterator it = conns.values().iterator();
-        while ( it.hasNext() )
-        {
-            Connection conn = (Connection)it.next();
+        for (Connection conn : conns.values()) {
             conn.close();
         }
         conns.clear();
@@ -4456,7 +4447,8 @@ public class J2EEDataSourceTest extends 
 
         //  First get a bunch of pooled connections
         //  and make sure they're all unique
-        Hashtable xaConns = new Hashtable();
+        HashMap<String, XAConnection> xaConns =
+                new HashMap<String, XAConnection>();
         for ( int i = 0 ; i < numConnections ; i++ )
         {
             XAConnection xc = xds.getXAConnection();
@@ -4501,7 +4493,8 @@ public class J2EEDataSourceTest extends 
 
         //  First get a bunch of pooled connections
         //  and make sure they're all unique
-        Hashtable pooledConns = new Hashtable();
+        HashMap<String, PooledConnection> pooledConns =
+                new HashMap<String, PooledConnection>();
         for ( int i = 0 ; i < numConnections ; i++ )
         {
             PooledConnection pc = pds.getPooledConnection();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCDriversPropertyTest.java Thu May 16 06:34:59 2013
@@ -20,9 +20,6 @@
  */
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -56,12 +53,10 @@ abstract class JDBCDriversPropertyTest e
     private static Test getAutoLoadSuite()
        throws Exception
     {
-        Class alt = Class.forName(
+        Class<?> alt = Class.forName(
            "org.apache.derbyTesting.functionTests.tests.jdbcapi.AutoloadTest");
-        
-        Method suiteMethod = alt.getMethod("suite", null);
-        
-        return (Test) suiteMethod.invoke(null, null);
+
+        return (Test) alt.getMethod("suite").invoke(null);
     }
     
     JDBCDriversPropertyTest() {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java Thu May 16 06:34:59 2013
@@ -1000,14 +1000,14 @@ public class ParameterMappingTest extend
                 "char_col", "varchar_col"
             };
         
-        HashSet smallIntColumns = new HashSet();
+        HashSet<String> smallIntColumns = new HashSet<String>();
         for ( int i = 0; i < allColumns.length; i++ )
         {
             String  colName = allColumns[ i ];
             if ( colName.endsWith( "int_col" ) ) { smallIntColumns.add( colName ); }
         }
 
-        HashSet smallCharColumns = new HashSet();
+        HashSet<String> smallCharColumns = new HashSet<String>();
         for ( int i = 0; i < allColumns.length; i++ )
         {
             String  colName = allColumns[ i ];

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PoolXADSCreateShutdownDBTest.java Thu May 16 06:34:59 2013
@@ -19,12 +19,9 @@
 
 package org.apache.derbyTesting.functionTests.tests.jdbcapi;
 
-import java.io.File;
 import java.lang.reflect.Method;
-import java.security.AccessController;
 import java.sql.SQLException;
 
-import javax.sql.DataSource;
 import javax.sql.ConnectionPoolDataSource;
 import javax.sql.XADataSource;
 
@@ -34,7 +31,6 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
-import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.J2EEDataSource;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.TestConfiguration;
@@ -86,62 +82,11 @@ public class PoolXADSCreateShutdownDBTes
         // attempt to get rid of any databases. 
         // only 5 dbs (in addition to the defaultdb) should actually get
         // created, but just in case...
-        AccessController.doPrivileged(new java.security.PrivilegedAction() {
-            public Object run() {
-                for (int i=0 ; i < ADDITIONAL_DBS.length ; i++)
-                {   
-                    removeDatabase("emb" + ADDITIONAL_DBS[i]);
-                    removeDatabase("srv" + ADDITIONAL_DBS[i]);
-                } 
-                return null;
-            }
-            
-            void removeDatabase(String dbName)
-            {
-                //TestConfiguration config = TestConfiguration.getCurrent();
-                dbName = dbName.replace('/', File.separatorChar);
-                String dsh = BaseTestCase.getSystemProperty("derby.system.home");
-                if (dsh == null) {
-                    fail("not implemented");
-                } else {
-                    dbName = dsh + File.separator + dbName;
-                }
-                removeDirectory(dbName);
-            }
-
-            void removeDirectory(String path)
-            {
-                final File dir = new File(path);
-                removeDir(dir);
-            }
-
-            private void removeDir(File dir) {
-                
-                // Check if anything to do!
-                // Database may not have been created.
-                if (!dir.exists())
-                    return;
-
-                String[] list = dir.list();
-
-                // Some JVMs return null for File.list() when the
-                // directory is empty.
-                if (list != null) {
-                    for (int i = 0; i < list.length; i++) {
-                        File entry = new File(dir, list[i]);
-
-                        if (entry.isDirectory()) {
-                            removeDir(entry);
-                        } else {
-                            entry.delete();
-                            //assertTrue(entry.getPath(), entry.delete());
-                        }
-                    }
-                }
-                dir.delete();
-                //assertTrue(dir.getPath(), dir.delete());
-            }
-        });
+        TestConfiguration conf = TestConfiguration.getCurrent();
+        for (int i = 0; i < ADDITIONAL_DBS.length; i++) {
+            removeDirectory(conf.getDatabasePath("emb" + ADDITIONAL_DBS[i]));
+            removeDirectory(conf.getDatabasePath("srv" + ADDITIONAL_DBS[i]));
+        }
         super.tearDown();
     }
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetStreamTest.java Thu May 16 06:34:59 2013
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.io.StringReader;
-import java.net.ServerSocket;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
@@ -63,8 +62,9 @@ public class ResultSetStreamTest extends
     public void testInsertData() throws SQLException, Exception {
         try {
 
-            AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                public Object run() throws SQLException, FileNotFoundException,
+            AccessController.doPrivileged(
+                    new PrivilegedExceptionAction<Void>() {
+                public Void run() throws SQLException, FileNotFoundException,
                         IOException {
                     insertData();
                     return null;
@@ -167,8 +167,9 @@ public class ResultSetStreamTest extends
     public void testBinaryStreamProcessing() throws SQLException, Exception {
         try {
 
-            AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                public Object run() throws SQLException, FileNotFoundException,
+            AccessController.doPrivileged(
+                    new PrivilegedExceptionAction<Void>() {
+                public Void run() throws SQLException, FileNotFoundException,
                         IOException {
                     binaryStreamProcessing();
                     return null;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURDataModelSetup.java Thu May 16 06:34:59 2013
@@ -172,12 +172,12 @@ public class SURDataModelSetup extends B
 
         /** Array with all values */
         private final static Set values = Collections.unmodifiableSet
-            (new HashSet((Arrays.asList(new SURDataModel[] {
+            (new HashSet<SURDataModel>(Arrays.asList(
                 MODEL_WITH_NO_KEYS, 
                 MODEL_WITH_PK, 
                 MODEL_WITH_SECONDARY_KEY,
                 MODEL_WITH_PK_AND_SECONDARY_KEY
-            }))));
+            )));
         
         /**
          * Returns an unmodifyable set of all valid data models

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java Thu May 16 06:34:59 2013
@@ -91,13 +91,13 @@ public class SURQueryMixTest extends SUR
         checkRowDeleted = dbMeta.ownDeletesAreVisible(rs.getType());
         
         // Create map with rows
-        Map rows = createRowMap(rs);
+        Map<Integer, String> rows = createRowMap(rs);
         
         // Set of rows which are updated (contains Integer with position in RS)
-        final Set updatedRows = new HashSet();
+        final Set<Integer> updatedRows = new HashSet<Integer>();
         
         // Set of rows which are deleted (contains Integer with position in RS)
-        final Set deletedRows = new HashSet();
+        final Set<Integer> deletedRows = new HashSet<Integer>();
                 
         // Test navigation
         testNavigation(rs, rows, updatedRows, deletedRows);
@@ -149,10 +149,10 @@ public class SURQueryMixTest extends SUR
      * ResultSet (Integer 1..n), while the value is a
      * concatenation of the strings for all columns in the row.
      */
-    private Map createRowMap(final ResultSet rs) 
+    private Map<Integer, String> createRowMap(final ResultSet rs)
         throws SQLException
     {
-        final Map rows = new HashMap();        
+        final Map<Integer, String> rows = new HashMap<Integer, String>();
         rs.beforeFirst();
         assertTrue("Unexpected return from isBeforeFirst()",
                    rs.isBeforeFirst());
@@ -166,7 +166,7 @@ public class SURQueryMixTest extends SUR
             i++;
             String row = getRowString(rs);
             println(row);
-            rows.put(new Integer(i), row);
+            rows.put(i, row);
             sum += rs.getInt(1);
             if (rs.getInt(1) < 0) {
                 checkSum = false;
@@ -191,12 +191,11 @@ public class SURQueryMixTest extends SUR
      * @param k number of rows in the sample
      * @return a list containing k elements of rows
      **/
-    private List createRandomSample(final Map rows, int k) {
+    private List createRandomSample(final Map<Integer, String> rows, int k) {
         Random r = new Random();
-        ArrayList sampledKeys = new ArrayList();
+        ArrayList<Integer> sampledKeys = new ArrayList<Integer>();
         int n = 0;        
-        for (Iterator i = rows.keySet().iterator(); i.hasNext();) {
-            Object key = i.next();
+        for (Integer key : rows.keySet()) {
             n++;            
             if (n<=k) {
                 sampledKeys.add(key);
@@ -223,8 +222,8 @@ public class SURQueryMixTest extends SUR
      * @param k number of records to be deleted
      */
     private void deleteRandomSampleOfNRecords(final ResultSet rs, 
-                                              final Map rows,
-                                              final Set deletedRows,
+                                              final Map<Integer, String> rows,
+                                              final Set<Integer> deletedRows,
                                               final int k) 
         throws SQLException
     {
@@ -260,8 +259,8 @@ public class SURQueryMixTest extends SUR
      * @param k number of records to be updated
      */
     private void updateRandomSampleOfNRecords(final ResultSet rs, 
-                                              final Map rows,
-                                              final Set updatedRows,
+                                              final Map<Integer, String> rows,
+                                              final Set<Integer> updatedRows,
                                               final int k) 
         throws SQLException
     {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SetQueryTimeoutTest.java Thu May 16 06:34:59 2013
@@ -191,7 +191,7 @@ public class SetQueryTimeoutTest
         throws
             TestFailedException
     {
-        Collection ignore = new HashSet();
+        HashSet<String> ignore = new HashSet<String>();
         ignore.add("42Y55");
         
         exec(conn, "drop table " + tablePrefix + "_orig", ignore);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XAJNDITest.java Thu May 16 06:34:59 2013
@@ -78,7 +78,7 @@ public class XAJNDITest extends BaseJDBC
     private InitialDirContext getInitialDirContext()
     {
         try {
-            Hashtable env = new Hashtable();
+            Hashtable<String, String> env = new Hashtable<String, String>();
             // using properties - these will have been passed in.
             String ldapContextFactory=getSystemProperty("derbyTesting.ldapContextFactory");
             if (ldapContextFactory == null || ldapContextFactory.length() < 1)
@@ -146,7 +146,7 @@ public class XAJNDITest extends BaseJDBC
      */
     private static String[] getPropertyBeanList(Object ds) {
         Method[] allMethods = ds.getClass().getMethods();
-        ArrayList properties = new ArrayList();
+        ArrayList<String> properties = new ArrayList<String>();
 
         for (int i = 0; i < allMethods.length; i++) {
             Method method = allMethods[i];
@@ -175,6 +175,7 @@ public class XAJNDITest extends BaseJDBC
                     rt.isPrimitive());
             }
         }
-        return (String[])properties.toArray(new String[properties.size()]);
+
+        return properties.toArray(new String[properties.size()]);
     }
 }
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java Thu May 16 06:34:59 2013
@@ -29,7 +29,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
-import java.util.Iterator;
 
 import javax.sql.XAConnection;
 import javax.sql.XADataSource;
@@ -920,7 +919,7 @@ public class XATest extends BaseJDBCTest
         shh.executeUpdate("DELETE FROM APP.foo966 where A < -99");
         sch.executeUpdate("DELETE FROM APP.foo966 where A < -99");
 
-        ArrayList openRS = new ArrayList();
+        ArrayList<ResultSet> openRS = new ArrayList<ResultSet>();
 
         // Statements obtained while default was hold.
         // All should work, holability will be downgraded
@@ -967,8 +966,7 @@ public class XATest extends BaseJDBCTest
         // JDBC 4.0 method getHoldabilty to ensure the
         // holdability is reported correctly.
         int orsCount = 0;
-        for (Iterator i = openRS.iterator(); i.hasNext();) {
-            ResultSet ors = (ResultSet) i.next();
+        for (ResultSet ors : openRS) {
             ors.clearWarnings();
             orsCount++;
         }
@@ -1039,8 +1037,7 @@ public class XATest extends BaseJDBCTest
         // test, clearWarnings throws an error if the ResultSet
         // is closed.
         int crsCount = 0;
-        for (Iterator i = openRS.iterator(); i.hasNext();) {
-            ResultSet crs = (ResultSet) i.next();
+        for (ResultSet crs : openRS) {
             try {
                 crs.clearWarnings();
             } catch (SQLException sqle) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/build.xml Thu May 16 06:34:59 2013
@@ -84,6 +84,7 @@
         <pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
+      <compilerarg value="-Xlint"/>
     </javac>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/BasicSetup.java Thu May 16 06:34:59 2013
@@ -1433,7 +1433,7 @@ public class BasicSetup extends UpgradeC
 
     private int[][] constructPowerSet( int count )
     {
-    	java.util.ArrayList list = new java.util.ArrayList();
+    	ArrayList<int[]> list = new ArrayList<int[]>();
         boolean[]           inclusions = new boolean[ count ];
 
         include( list, 0, inclusions );
@@ -1444,7 +1444,7 @@ public class BasicSetup extends UpgradeC
         return result;
     }
 
-    private void    include( ArrayList list, int idx, boolean[] inclusions )
+    private void include( ArrayList<int[]> list, int idx, boolean[] inclusions )
     {
         if ( idx >= inclusions.length )
         {
@@ -1474,7 +1474,8 @@ public class BasicSetup extends UpgradeC
         include( list, idx, inclusions, true );
     }
 
-    private void    include( ArrayList list, int idx, boolean[] inclusions, boolean currentCell )
+    private void include(ArrayList<int[]> list, int idx, boolean[] inclusions,
+                         boolean currentCell)
     {
         inclusions[ idx++ ] = currentCell;
 
@@ -1489,7 +1490,7 @@ public class BasicSetup extends UpgradeC
     ////////////////////////////////////////////////
     private int[][] permute( int[][] original )
     {
-        ArrayList list = new ArrayList();
+        ArrayList<int[]> list = new ArrayList<int[]>();
 
         for ( int i = 0; i < original.length; i++ )
         {
@@ -1502,7 +1503,7 @@ public class BasicSetup extends UpgradeC
         return result;
     }
 
-    private void   permute( ArrayList list, int[] start, int[] remainder )
+    private void permute( ArrayList<int[]> list, int[] start, int[] remainder )
     {
         int startLength = start.length;
         int remainderLength = remainder.length;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_7.java Thu May 16 06:34:59 2013
@@ -143,8 +143,8 @@ public class Changes10_7 extends Upgrade
      * @return a set with the names of all supported types in the loaded
      * version of Derby
      */
-    private Set getSupportedTypes() throws SQLException {
-        HashSet types = new HashSet();
+    private Set<String> getSupportedTypes() throws SQLException {
+        HashSet<String> types = new HashSet<String>();
         ResultSet rs = getConnection().getMetaData().getTypeInfo();
         while (rs.next()) {
             types.add(rs.getString("TYPE_NAME"));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java Thu May 16 06:34:59 2013
@@ -660,7 +660,7 @@ public class Changes10_9 extends Upgrade
      * where <em>h</em> id a lower case hex digit.
      */
     private void initPattern() {
-        List l = new ArrayList(100);
+        List<Goal> l = new ArrayList<Goal>(100);
         // The UUID format is determined by
         // org.apache.derby.impl.services.uuid.BasicUUID#toString
 
@@ -689,8 +689,8 @@ public class Changes10_9 extends Upgrade
         l.add(new SingleChar('.'));
         l.add(new SingleChar('G'));
         l.add(new CharRange(new char[][]{{'0','9'}}, Goal.REPEAT));
-        this.pattern = new Goal[l.size()];
-        System.arraycopy(l.toArray(), 0, this.pattern, 0, l.size());
+
+        this.pattern = l.toArray(new Goal[l.size()]);
     }
 
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/OldVersions.java Thu May 16 06:34:59 2013
@@ -92,7 +92,7 @@ public class OldVersions
      */
     private static int[][] getSupportedVersions( int[][] old )
     {
-        ArrayList list = new ArrayList();
+        ArrayList<int[]> list = new ArrayList<int[]>();
         int count = old.length;
         
         for (int i = 0; i < count; i++) {
@@ -125,10 +125,7 @@ public class OldVersions
             list.add( old[ i ] );
         }
 
-        int[][] result = new int[ list.size() ][ 4 ];
-        list.toArray( result );
-
-        return result;
+        return list.toArray(new int[list.size()][]);
     }
     
     private static int[][] getVersions(String oldVersionsPath)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/PhaseChanger.java Thu May 16 06:34:59 2013
@@ -67,7 +67,7 @@ final class PhaseChanger extends BaseTes
      */
     protected void setUp() throws SQLException
     {
-        UpgradeChange.phase.set(new Integer(phase));
+        UpgradeChange.phase.set(phase);
         UpgradeChange.oldVersion.set(version);
         
         TestConfiguration config = TestConfiguration.getCurrent();
@@ -178,7 +178,7 @@ final class PhaseChanger extends BaseTes
             // that live in a class loader that is able to load the driver. So
             // create an instance of DriverUnloader in the old driver's class
             // loader.
-            Class unloader = Class.forName(
+            Class<?> unloader = Class.forName(
                     DriverUnloader.class.getName(), true, loader);
             Method m = unloader.getMethod("unload", (Class[]) null);
             Boolean res = (Boolean) m.invoke(null, (Object[]) null);
@@ -282,7 +282,7 @@ final class PhaseChanger extends BaseTes
             // setting the field to null.
             Field tclField = cls.getDeclaredField("threadContextList");
             tclField.setAccessible(true);
-            ThreadLocal tcl = (ThreadLocal) tclField.get(contextService);
+            ThreadLocal<?> tcl = (ThreadLocal) tclField.get(contextService);
             tcl.set(null);
 
             // The field allContexts is a HashSet. Calling clear() should be

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeChange.java Thu May 16 06:34:59 2013
@@ -34,14 +34,14 @@ abstract class UpgradeChange extends Bas
      * Thread local for the phase of the test set.
      * Contains an Integer object.
      */
-    static ThreadLocal phase = new ThreadLocal();
+    static final ThreadLocal<Integer> phase = new ThreadLocal<Integer>();
     
     /**
      * Thread local for the old version of the engine.
      * Contains a int array with four entries corresponding
      * to the four part Derby number.
      */
-    static ThreadLocal oldVersion = new ThreadLocal();
+    static final ThreadLocal<int[]> oldVersion = new ThreadLocal<int[]>();
     
     /**
      * SWL state thrown when a feature requires upgrade
@@ -92,7 +92,7 @@ abstract class UpgradeChange extends Bas
      */
     final int getPhase()
     {
-        return ((Integer) phase.get()).intValue();
+        return phase.get();
     }
     
     /**

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeClassLoader.java Thu May 16 06:34:59 2013
@@ -28,6 +28,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 import junit.framework.Assert;
 
@@ -48,32 +49,17 @@ public class UpgradeClassLoader
             //"derbytools.jar"
             };
 
-    static final String oldVersionsPath;
-    static final String jarPath;
-    
-    static {
-         
-        oldVersionsPath = (String) AccessController.doPrivileged
-        (new java.security.PrivilegedAction(){
-
-            public Object run(){
-            return System.getProperty(_Suite.OLD_VERSIONS_PATH_PROPERTY);
-
-            }
-
-        }
-         );
-
-         jarPath = (String ) AccessController.doPrivileged
-        (new java.security.PrivilegedAction(){
-
-            public Object run(){
-            return System.getProperty(_Suite.OLD_RELEASE_PATH_PROPERTY);
-
+    static final String oldVersionsPath =
+            getSystemProperty(_Suite.OLD_VERSIONS_PATH_PROPERTY);
+    static final String jarPath =
+            getSystemProperty(_Suite.OLD_RELEASE_PATH_PROPERTY);
+
+    private static String getSystemProperty(final String key) {
+        return AccessController.doPrivileged(new PrivilegedAction<String>() {
+            public String run() {
+                return System.getProperty(key);
             }
-
-        }
-         );
+        });
     }
 
     protected static String getTextVersion(int[] iv)
@@ -90,17 +76,13 @@ public class UpgradeClassLoader
      */
     public static ClassLoader makeClassLoader( final int[] version )
     {
-        ClassLoader oldLoader = (ClassLoader )AccessController.doPrivileged
-        (new java.security.PrivilegedAction(){
-
-            public Object run(){
-            return createClassLoader(version);
-
+        ClassLoader oldLoader = AccessController.doPrivileged(
+                new PrivilegedAction<ClassLoader>() {
+            public ClassLoader run() {
+                return createClassLoader(version);
             }
+        });
 
-        }
-         );
-        
         if (oldLoader == null)
         {
             BaseTestCase.traceit("Empty: Skip upgrade Tests (no jars) for " + getTextVersion(version));
@@ -115,11 +97,8 @@ public class UpgradeClassLoader
      * </p>
      */
     public static void setThreadLoader(final ClassLoader which) {
-
-        AccessController.doPrivileged
-        (new java.security.PrivilegedAction(){
-            
-            public Object run()  { 
+        AccessController.doPrivileged(new PrivilegedAction<Void>() {
+            public Void run() {
                 java.lang.Thread.currentThread().setContextClassLoader(which);
               return null;
             }
@@ -132,11 +111,9 @@ public class UpgradeClassLoader
      * </p>
      */
     public static ClassLoader getThreadLoader() {
-
-        return (ClassLoader) AccessController.doPrivileged
-        (new java.security.PrivilegedAction(){
-            
-            public Object run()  { 
+        return AccessController.doPrivileged(
+                new PrivilegedAction<ClassLoader>() {
+            public ClassLoader run() {
                 return Thread.currentThread().getContextClassLoader();
             }
         });

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Version.java Thu May 16 06:34:59 2013
@@ -31,7 +31,7 @@ import org.apache.derby.iapi.services.in
  * A Derby version.
  * </p>
  */
-public class Version implements Comparable
+public class Version implements Comparable<Version>
 {
     ///////////////////////////////////////////////////////////////////////////////////
     //
@@ -53,7 +53,8 @@ public class Version implements Comparab
 
     // we keep one class loader per version so that we don't have an explosion
     // of class loaders for redundant versions
-    private static HashMap _classLoaders = new HashMap();
+    private static HashMap<String, ClassLoader> _classLoaders =
+            new HashMap<String, ClassLoader>();
     
     ///////////////////////////////////////////////////////////////////////////////////
     //
@@ -158,16 +159,13 @@ public class Version implements Comparab
     //
     ///////////////////////////////////////////////////////////////////////////////////
 
-    public int compareTo( Object other )
+    public int compareTo( Version other )
     {
         if ( other == null ) { return 1; }
-        if ( !(other instanceof Version) ) { return 1; }
-
-        Version that = (Version) other;
 
         for ( int i = 0; i < EXPECTED_LEG_COUNT; i++ )
         {
-            int result = this._legs[ i ] - that._legs[ i ];
+            int result = this._legs[ i ] - other._legs[ i ];
 
             if ( result != 0 ) { return result; }
         }
@@ -175,7 +173,9 @@ public class Version implements Comparab
         return 0;
     }
 
-    public boolean equals( Object other ) { return ( compareTo( other ) == 0 ); }
+    public boolean equals( Object other ) {
+        return (other instanceof Version) && (compareTo((Version) other) == 0);
+    }
     public int hashCode() { return toString().hashCode(); }
     
     ///////////////////////////////////////////////////////////////////////////////////
@@ -236,9 +236,11 @@ public class Version implements Comparab
          * Construct from a list of Versions.
          * </p>
          */
-        public Trajectory( ArrayList versionList )
+        public Trajectory( ArrayList<Version> versionList )
         {
-            if ( versionList == null ) { versionList = new ArrayList(); }
+            if (versionList == null) {
+                versionList = new ArrayList<Version>();
+            }
 
             Version[] versions = new Version[ versionList.size() ];
             versionList.toArray( versions );

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java?rev=1483202&r1=1483201&r2=1483202&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/helpers/DisposableIndexStatistics.java Thu May 16 06:34:59 2013
@@ -222,7 +222,9 @@ public class DisposableIndexStatistics {
             // instance statistics for single column unique indexes).
             expected--;
         }
-        ArrayList entries = new ArrayList(); // used for reporting only
+        // used for reporting only
+        ArrayList<IndexStatsUtil.IdxStats> entries =
+                new ArrayList<IndexStatsUtil.IdxStats>();
         int found = getAllRelevantStats(entries);
         if (found != expected) {
             Assert.assertEquals(
@@ -234,11 +236,9 @@ public class DisposableIndexStatistics {
     }
 
     /** Converts the list of statistics to an array. */
-    private IndexStatsUtil.IdxStats[] getStatArray(List list) {
-        int size = list.size();
-        IndexStatsUtil.IdxStats[] ret = new IndexStatsUtil.IdxStats[size];
-        list.toArray(ret);
-        return ret;
+    private IndexStatsUtil.IdxStats[] getStatArray(
+            List<IndexStatsUtil.IdxStats> list) {
+        return list.toArray(new IndexStatsUtil.IdxStats[list.size()]);
     }
 
     /**
@@ -248,7 +248,7 @@ public class DisposableIndexStatistics {
      * @return The number of relevant statistics entries found.
      * @throws SQLException if something goes wrong
      */
-    private int getAllRelevantStats(List list)
+    private int getAllRelevantStats(List<IndexStatsUtil.IdxStats> list)
             throws SQLException {
         boolean oldAutoCommitValue = con.getAutoCommit();
         con.setAutoCommit(true);



Mime
View raw message