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

[jOOQ/jOOQ#10951] JPAConverter may cause DataTypeException if it does

Browse Source 
not detect the proper <T, U> types using reflection
This commit is contained in:
Lukas Eder 2020-11-17 15:57:31 +01:00
parent 9a3c78df59
commit a58fe6fc80
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jOOQ/src/main/java/org/jooq/impl/JPAConverter.java
View File

@ -42,6 +42,7 @@ import java.lang.reflect.Method;
import javax.persistence.AttributeConverter;
import org.jooq.exception.MappingException;
import org.jooq.tools.JooqLogger;
import org.jooq.tools.reflect.Reflect;
@ -63,6 +64,7 @@ public final class JPAConverter<T, U> extends AbstractConverter<T, U> {
* Generated UID
*/
private static final long serialVersionUID = -8359212595180862077L;
private static final JooqLogger log = JooqLogger.getLogger(JPAConverter.class);
private final AttributeConverter<U, T> delegate;
@ -79,18 +81,40 @@ public final class JPAConverter<T, U> extends AbstractConverter<T, U> {
@SuppressWarnings("unchecked")
private static final <T> Class<T> fromType(Class<? extends AttributeConverter<?, T>> klass) {
for (Method method : klass.getMethods())
Method candidate = null;
// [#10951] Try finding the bridge method, skip the inherited method if applicable
for (Method method : klass.getDeclaredMethods())
if ("convertToDatabaseColumn".equals(method.getName()))
return (Class<T>) method.getReturnType();
if (method.getReturnType() == Object.class)
candidate = method;
else
return (Class<T>) method.getReturnType();
if (candidate != null) {
log.warn("Couldn't find bridge method to detect generic type bound for " + klass.getName() + "::convertToDatabaseColumn");
return (Class<T>) candidate.getReturnType();
}
throw new IllegalArgumentException();
}
@SuppressWarnings("unchecked")
private static final <U> Class<U> toType(Class<? extends AttributeConverter<U, ?>> klass) {
for (Method method : klass.getMethods())
Method candidate = null;
// [#10951] Try finding the bridge method, skip the inherited method if applicable
for (Method method : klass.getDeclaredMethods())
if ("convertToEntityAttribute".equals(method.getName()))
return (Class<U>) method.getReturnType();
if (method.getReturnType() == Object.class)
candidate = method;
else
return (Class<U>) method.getReturnType();
if (candidate != null) {
log.warn("Couldn't find bridge method to detect generic type bound for " + klass.getName() + "::convertToEntityAttribute");
return (Class<U>) candidate.getReturnType();
}
throw new IllegalArgumentException();
}