moparisthebest/beehive
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Update NewDefaultObjectResultSetMapper for new toType signature from upstream

Browse Source
This commit is contained in:
Travis Burtrum 2018-05-11 11:14:27 -04:00
parent 93a9145d45
commit 2ea7dd2b83
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
beehive-jdbc-control/src/main/java/org/apache/beehive/controls/system/jdbc/NewDefaultObjectResultSetMapper.java
View File

@ -28,7 +28,8 @@ public class NewDefaultObjectResultSetMapper extends com.moparisthebest.jdbc.Cas
@SuppressWarnings({"unchecked"})
public Object mapToResultType(ControlBeanContext context, Method m, ResultSet rs, Calendar cal) {
final Type type = m.getGenericReturnType();
return toType(rs, m.getReturnType(), type instanceof ParameterizedType ? (ParameterizedType) type : null, context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal);
// todo: is genericArray: false correct here? good enough I guess...
return toType(rs, m.getReturnType(), type instanceof ParameterizedType ? (ParameterizedType) type : null, false, context.getMethodPropertySet(m, JdbcControl.SQL.class).arrayMaxLength(), cal);
}
// todo: true is probably not valid for Stream and ResultSetIterable