diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java index d3802553d..55a5d9fed 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java +++ b/querydsl-core/src/main/java/com/querydsl/core/alias/AliasFactory.java @@ -17,9 +17,6 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; -import net.sf.cglib.proxy.Enhancer; -import net.sf.cglib.proxy.MethodInterceptor; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -29,6 +26,9 @@ import com.querydsl.core.types.EntityPath; import com.querydsl.core.types.Expression; import com.querydsl.core.types.PathMetadataFactory; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; + /** * AliasFactory is a factory class for alias creation * @@ -90,11 +90,10 @@ public class AliasFactory { * * @param * @param cl - * @param parent * @param path * @return */ - public A createAliasForProperty(Class cl, Object parent, Expression path) { + public A createAliasForProperty(Class cl, Expression path) { return createProxy(cl, path); } diff --git a/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java b/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java index 549c5ce89..970ddc2b5 100644 --- a/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java +++ b/querydsl-core/src/main/java/com/querydsl/core/alias/PropertyAccessInvocationHandler.java @@ -210,22 +210,22 @@ public class PropertyAccessInvocationHandler implements MethodInterceptor { Class keyType = (Class)ReflectionUtils.getTypeParameter(genericType, 0); Class valueType = (Class)ReflectionUtils.getTypeParameter(genericType, 1); path = pathFactory.createMapPath(keyType, valueType, metadata); - rv = aliasFactory.createAliasForProperty(type, parent, path); + rv = aliasFactory.createAliasForProperty(type, path); } else if (typeSystem.isListType(type)) { Class elementType = (Class)ReflectionUtils.getTypeParameter(genericType, 0); path = pathFactory.createListPath(elementType, metadata); - rv = aliasFactory.createAliasForProperty(type, parent, path); + rv = aliasFactory.createAliasForProperty(type, path); } else if (typeSystem.isSetType(type)) { Class elementType = ReflectionUtils.getTypeParameterAsClass(genericType, 0); path = pathFactory.createSetPath(elementType, metadata); - rv = aliasFactory.createAliasForProperty(type, parent, path); + rv = aliasFactory.createAliasForProperty(type, path); } else if (typeSystem.isCollectionType(type)) { Class elementType = ReflectionUtils.getTypeParameterAsClass(genericType, 0); path = pathFactory.createCollectionPath(elementType, metadata); - rv = aliasFactory.createAliasForProperty(type, parent, path); + rv = aliasFactory.createAliasForProperty(type, path); } else if (Enum.class.isAssignableFrom(type)) { path = pathFactory.createEnumPath((Class)type, metadata); @@ -244,7 +244,7 @@ public class PropertyAccessInvocationHandler implements MethodInterceptor { path = pathFactory.createEntityPath(type, metadata); } if (!Modifier.isFinal(type.getModifiers())) { - rv = aliasFactory.createAliasForProperty(type, parent, path); + rv = aliasFactory.createAliasForProperty(type, path); } else { rv = null; }