CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve normalization

Browse Source
This commit is contained in:
Timo Westkämper 2016-01-08 18:45:41 +02:00
parent 175b2668ba
commit eed0456e13
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
View File

@ -86,6 +86,10 @@ public class QBean<T> extends FactoryExpressionBase<T> {
return cl.isPrimitive() ? Primitives.wrap(cl) : cl;
}
private static boolean isAssignableFrom(Class<?> cl1, Class<?> cl2) {
return normalize(cl1).isAssignableFrom(normalize(cl2));
}
private final ImmutableMap<String, Expression<?>> bindings;
private final List<Field> fields;
@ -156,7 +160,7 @@ public class QBean<T> extends FactoryExpressionBase<T> {
try {
field = beanType.getDeclaredField(property);
field.setAccessible(true);
if (!normalize(field.getType()).isAssignableFrom(expr.getType())) {
if (!isAssignableFrom(field.getType(), expr.getType())) {
typeMismatch(field.getType(), expr);
}
beanType = Object.class;
@ -186,7 +190,7 @@ public class QBean<T> extends FactoryExpressionBase<T> {
for (PropertyDescriptor prop : propertyDescriptors) {
if (prop.getName().equals(property)) {
setter = prop.getWriteMethod();
if (!normalize(prop.getPropertyType()).isAssignableFrom(expr.getType())) {
if (!isAssignableFrom(prop.getPropertyType(), expr.getType())) {
typeMismatch(prop.getPropertyType(), expr);
}
break;