From 53c7d19c29ed5ffd3f1530e1601c72fc3e84e2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 9 Mar 2010 22:12:55 +0000 Subject: [PATCH] --- .../src/main/java/com/mysema/util/ReflectionUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java b/querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java index c3a8f1f02..d51e20865 100644 --- a/querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java +++ b/querydsl-core/src/main/java/com/mysema/util/ReflectionUtils.java @@ -28,8 +28,8 @@ public final class ReflectionUtils { private ReflectionUtils(){} public static AnnotatedElement getAnnotatedElement(Class beanClass, String propertyName, Class propertyClass){ - Field field = getField(beanClass, propertyName); - Method method = getGetter(beanClass, propertyName, propertyClass); + Field field = getFieldOrNull(beanClass, propertyName); + Method method = getGetterOrNull(beanClass, propertyName, propertyClass); if (field == null || field.getAnnotations().length == 0){ return (method != null && method.getAnnotations().length > 0) ? method : EMPTY; }else if (method == null || method.getAnnotations().length == 0){ @@ -40,7 +40,7 @@ public final class ReflectionUtils { } @Nullable - private static Field getField(Class beanClass, String propertyName){ + private static Field getFieldOrNull(Class beanClass, String propertyName){ while (beanClass != null && !beanClass.equals(Object.class)){ try { return beanClass.getDeclaredField(propertyName); @@ -53,7 +53,7 @@ public final class ReflectionUtils { } @Nullable - private static Method getGetter(Class beanClass, String name, Class type){ + private static Method getGetterOrNull(Class beanClass, String name, Class type){ String methodName = (type.equals(Boolean.class) ? "is" : "get") + StringUtils.capitalize(name); while(beanClass != null && !beanClass.equals(Object.class)){ try {