github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#10686] ConnectionRunnable and ConnectionCallable should

Browse Source 
accept throwing Throwable
This commit is contained in:
Lukas Eder 2020-09-24 16:42:31 +02:00
parent f491e8c166
commit 0dc27d7102
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jOOQ/src/main/java/org/jooq/ConnectionCallable.java
View File

@ -66,9 +66,9 @@ public interface ConnectionCallable<T> {
*
* @param connection The connection.
* @return The outcome of the callable.
* @throws Exception Any exception, including {@link SQLException}, that
* @throws Throwable Any exception, including {@link SQLException}, that
* will be propagated as an unchecked
* {@link DataAccessException}.
*/
T run(Connection connection) throws Exception;
T run(Connection connection) throws Throwable;
}

4
jOOQ/src/main/java/org/jooq/ConnectionRunnable.java
View File

@ -65,9 +65,9 @@ public interface ConnectionRunnable {
* this {@link ConnectionRunnable}.
*
* @param connection The connection.
* @throws Exception Any exception, including {@link SQLException}, that
* @throws Throwable Any exception, including {@link SQLException}, that
* will be propagated as an unchecked
* {@link DataAccessException}.
*/
void run(Connection connection) throws Exception;
void run(Connection connection) throws Throwable;
}

15
jOOQ/src/main/java/org/jooq/impl/DefaultDSLContext.java
View File

@ -660,11 +660,14 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
try {
return callable.run(connection);
}
catch (Error e) {
throw e;
}
catch (RuntimeException e) {
throw e;
}
catch (Exception e) {
throw new DataAccessException("Error while running ConnectionCallable", e);
catch (Throwable t) {
throw new DataAccessException("Error while running ConnectionCallable", t);
}
finally {
configuration().connectionProvider().release(connection);
@ -675,7 +678,7 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
public void connection(final ConnectionRunnable runnable) {
connectionResult(new ConnectionCallable<Void>() {
@Override
public Void run(Connection connection) throws Exception {
public Void run(Connection connection) throws Throwable {
runnable.run(connection);
return null;
}
@ -2820,6 +2823,12 @@ public class DefaultDSLContext extends AbstractScope implements DSLContext, Seri
try {
return callable.run(c);
}
catch (Error e) {
throw e;
}
catch (RuntimeException e) {
throw e;
}
catch (Throwable t) {
throw new DataAccessException("Error while running BatchedCallable", t);
}