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

Improve QBean alias handling

Browse Source
This commit is contained in:
Timo Westkämper 2015-05-19 23:10:49 +03:00
parent 60c46b1d71
commit ef9a74a80e
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ import java.util.Map;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.primitives.Primitives;
import com.querydsl.core.group.GroupExpression;
/**
* {@code QBean} is a JavaBean populating projection type
@ -61,7 +62,11 @@ public class QBean<T> extends FactoryExpressionBase<T> {
Operation<?> operation = (Operation<?>) expr;
if (operation.getOperator() == Ops.ALIAS && operation.getArg(1) instanceof Path<?>) {
Path<?> path = (Path<?>) operation.getArg(1);
rv.put(path.getMetadata().getName(), operation.getArg(0));
if (isCompoundExpression(operation.getArg(0))) {
rv.put(path.getMetadata().getName(), operation.getArg(0));
} else {
rv.put(path.getMetadata().getName(), operation);
}
} else {
throw new IllegalArgumentException("Unsupported expression " + expr);
}
@ -73,6 +78,10 @@ public class QBean<T> extends FactoryExpressionBase<T> {
return rv.build();
}
private static boolean isCompoundExpression(Expression<?> expr) {
return expr instanceof FactoryExpression || expr instanceof GroupExpression;
}
private static Class<?> normalize(Class<?> cl) {
return cl.isPrimitive() ? Primitives.wrap(cl) : cl;
}

6
querydsl-core/src/test/java/com/querydsl/core/types/QBeanTest.java
View File

@ -180,4 +180,10 @@ public class QBeanTest {
assertFalse(bean.equals(bean.skipNulls()));
}
@Test
public void Alias() {
QBean<Entity> beanProjection = new QBean<Entity>(Entity.class, name.as("name2"));
assertEquals(name.as("name2"), beanProjection.getArgs().get(0));
}
}