rather expose getJdbcSQLException than create new utility methods

h2/src/main/org/h2/message/DbException.java

@@ -347,9 +347,9 @@ public class DbException extends RuntimeException {
      * @param errorCode the error code
      * @return the SQLException object
      */
-    public static SQLException getSQLException(int errorCode)
+    public static SQLException getJdbcSQLException(int errorCode)
     {
-        return getJdbcSQLException(errorCode, null, new String[0]);
+        return getJdbcSQLException(errorCode, null);
     }
 
     /**
@@ -359,22 +359,9 @@ public class DbException extends RuntimeException {
      * @param p1 the first parameter of the message
      * @return the SQLException object
      */
-    public static SQLException getSQLException(int errorCode, String p1)
+    public static SQLException getJdbcSQLException(int errorCode, String p1)
     {
-        return getJdbcSQLException(errorCode, null, new String[] { p1 });
-    }
-
-    /**
-     * Create the SQL exception object for a specific error code.
-     *
-     * @param errorCode the error code
-     * @param cause the cause of the exception
-     * @param params the list of parameters of the message
-     * @return the exception
-     */
-    public static SQLException getSQLException(int errorCode, Throwable cause, String... params)
-    {
-        return getJdbcSQLException(errorCode, cause, params);
+        return getJdbcSQLException(errorCode, null, p1);
     }
 
     /**
@@ -385,7 +372,7 @@ public class DbException extends RuntimeException {
      * @param params the list of parameters of the message
      * @return the SQLException object
      */
-    private static JdbcSQLException getJdbcSQLException(int errorCode,
+    public static JdbcSQLException getJdbcSQLException(int errorCode,
             Throwable cause, String... params) {
         String sqlstate = ErrorCode.getState(errorCode);
         String message = translate(sqlstate, params);

h2/src/main/org/h2/store/FileLister.java

@@ -43,7 +43,7 @@ public class FileLister {
                     lock.lock(FileLockMethod.FILE);
                     lock.unlock();
                 } catch (DbException e) {
-                    throw DbException.getSQLException(
+                    throw DbException.getJdbcSQLException(
                             ErrorCode.CANNOT_CHANGE_SETTING_WHEN_OPEN_1,
                             message);
                 }
@@ -52,7 +52,7 @@ public class FileLister {
                     java.nio.channels.FileLock lock = f.tryLock(0, Long.MAX_VALUE, true);
                     lock.release();
                 } catch (Exception e) {
-                    throw DbException.getSQLException(
+                    throw DbException.getJdbcSQLException(
                             ErrorCode.CANNOT_CHANGE_SETTING_WHEN_OPEN_1, e,
                             message);
                 }

h2/src/main/org/h2/store/LobStorageBackend.java

@@ -226,7 +226,7 @@ public class LobStorageBackend implements LobStorageInterface {
                 prep.setLong(1, block);
                 ResultSet rs = prep.executeQuery();
                 if (!rs.next()) {
-                    throw DbException.getSQLException(ErrorCode.IO_EXCEPTION_1,
+                    throw DbException.getJdbcSQLException(ErrorCode.IO_EXCEPTION_1,
                             "Missing lob entry, block: " + block);
                 }
                 int compressed = rs.getInt(1);
@@ -652,7 +652,7 @@ public class LobStorageBackend implements LobStorageInterface {
                 prep.setLong(1, lobId);
                 ResultSet rs = prep.executeQuery();
                 if (!rs.next()) {
-                    throw DbException.getSQLException(ErrorCode.IO_EXCEPTION_1,
+                    throw DbException.getJdbcSQLException(ErrorCode.IO_EXCEPTION_1,
                             "Missing lob entry: " + lobId);
                 }
                 byteCount = rs.getLong(1);
@@ -667,7 +667,7 @@ public class LobStorageBackend implements LobStorageInterface {
             rs.next();
             int lobMapCount = rs.getInt(1);
             if (lobMapCount == 0) {
-                throw DbException.getSQLException(ErrorCode.IO_EXCEPTION_1,
+                throw DbException.getJdbcSQLException(ErrorCode.IO_EXCEPTION_1,
                         "Missing lob entry: " + lobId);
             }
             reuse(sql, prep);

h2/src/main/org/h2/tools/Csv.java

@@ -586,7 +586,7 @@ public class Csv implements SimpleRowSource {
     }
 
     private static SQLException convertException(String message, Exception e) {
-        return DbException.getSQLException(ErrorCode.IO_EXCEPTION_1, e, message);
+        return DbException.getJdbcSQLException(ErrorCode.IO_EXCEPTION_1, e, message);
     }
 
     /**

h2/src/main/org/h2/tools/SimpleResultSet.java

@@ -242,7 +242,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData,
     @Override
     public void beforeFirst() throws SQLException {
         if (autoClose) {
-            throw DbException.getSQLException(ErrorCode.RESULT_SET_NOT_SCROLLABLE);
+            throw DbException.getJdbcSQLException(ErrorCode.RESULT_SET_NOT_SCROLLABLE);
         }
         rowId = -1;
         if (source != null) {
@@ -278,7 +278,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData,
                 }
             }
         }
-        throw DbException.getSQLException(ErrorCode.COLUMN_NOT_FOUND_1, columnLabel);
+        throw DbException.getJdbcSQLException(ErrorCode.COLUMN_NOT_FOUND_1, columnLabel);
     }
 
     /**
@@ -2264,12 +2264,12 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData,
      * INTERNAL
      */
     static SQLException getUnsupportedException() {
-        return DbException.getSQLException(ErrorCode.FEATURE_NOT_SUPPORTED_1);
+        return DbException.getJdbcSQLException(ErrorCode.FEATURE_NOT_SUPPORTED_1);
     }
 
     private void checkClosed() throws SQLException {
         if (columns == null) {
-            throw DbException.getSQLException(ErrorCode.OBJECT_CLOSED);
+            throw DbException.getJdbcSQLException(ErrorCode.OBJECT_CLOSED);
         }
     }
 
@@ -2282,7 +2282,7 @@ public class SimpleResultSet implements ResultSet, ResultSetMetaData,
 
     private Object get(int columnIndex) throws SQLException {
         if (currentRow == null) {
-            throw DbException.getSQLException(ErrorCode.NO_DATA_AVAILABLE);
+            throw DbException.getJdbcSQLException(ErrorCode.NO_DATA_AVAILABLE);
         }
         checkColumnIndex(columnIndex);
         columnIndex--;

h2/src/main/org/h2/util/Tool.java

@@ -64,7 +64,7 @@ public abstract class Tool {
      */
     protected SQLException throwUnsupportedOption(String option)
             throws SQLException {
-        throw DbException.getSQLException(
+        throw DbException.getJdbcSQLException(
                 ErrorCode.FEATURE_NOT_SUPPORTED_1, option);
     }