Improve normalization

querydsl · Jan 9, 2016 · eed0456 · eed0456
1 parent 175b266
commit eed0456
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java b/querydsl-core/src/main/java/com/querydsl/core/types/QBean.java
@@ -86,6 +86,10 @@ private static Class<?> normalize(Class<?> cl) {
         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 @@ private List<Field> initFields(Map<String, ? extends Expression<?>> args) {
                 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 @@ private List<Method> initMethods(Map<String, ? extends Expression<?>> args) {
                 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;