Browse Source

Fix NullListQueryMapper.java for java6

dependabot/maven/junit-junit-4.13.1
Travis Burtrum 5 years ago
parent
commit
8698c2740d
  1. 10
      querymapper/src/main/java/com/moparisthebest/jdbc/NullListQueryMapper.java
  2. 1
      querymapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java

10
querymapper/src/main/java/com/moparisthebest/jdbc/NullListQueryMapper.java

@ -5,15 +5,13 @@ import com.moparisthebest.jdbc.util.ResultSetIterable; @@ -5,15 +5,13 @@ import com.moparisthebest.jdbc.util.ResultSetIterable;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
//IFJAVA8_START
import java.util.stream.Stream;
//IFJAVA8_END
import static com.moparisthebest.jdbc.NullQueryMapper.safeHandler;
//IFJAVA8_START
//IFJAVA8_END
public class NullListQueryMapper extends ListQueryMapper {
protected final NullQueryMapper.ThrowableHandler handler;
@ -90,7 +88,7 @@ public class NullListQueryMapper extends ListQueryMapper { @@ -90,7 +88,7 @@ public class NullListQueryMapper extends ListQueryMapper {
public <T> InList.InListObject inList(String columnName, Collection<T> values) {
try {
return delegate.inList(columnName, values);
} catch (SQLException e) {
} catch (Throwable e) {
handler.handle(e);
}
return null;
@ -100,7 +98,7 @@ public class NullListQueryMapper extends ListQueryMapper { @@ -100,7 +98,7 @@ public class NullListQueryMapper extends ListQueryMapper {
public <T> InList.InListObject notInList(String columnName, Collection<T> values) {
try {
return delegate.notInList(columnName, values);
} catch (SQLException e) {
} catch (Throwable e) {
handler.handle(e);
}
return null;

1
querymapper/src/main/java/com/moparisthebest/jdbc/NullQueryMapper.java

@ -5,7 +5,6 @@ import com.moparisthebest.jdbc.util.ResultSetIterable; @@ -5,7 +5,6 @@ import com.moparisthebest.jdbc.util.ResultSetIterable;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.*;
//IFJAVA8_START
import java.util.stream.Stream;

Loading…
Cancel
Save