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

Merge pull request #9 from mcuelenaere/fix_invalid_caching

Browse Source 
Fix AbstractEvaluatorFactory.toId() not taking into account constants' types
This commit is contained in:
Timo Westkämper 2012-10-23 14:06:58 -07:00
commit 16cde895b9
2 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/mysema/codegen/AbstractEvaluatorFactory.java
View File

@ -13,6 +13,7 @@ import java.util.Map;
import com.mysema.codegen.model.ClassType;
import com.mysema.codegen.model.Type;
import com.mysema.codegen.model.TypeCategory;
import java.util.Collection;
/**
* @author tiwe
@ -68,7 +69,7 @@ public abstract class AbstractEvaluatorFactory implements EvaluatorFactory{
public <T> Evaluator<T> createEvaluator(String source, ClassType projection, String[] names,
Type[] types, Class<?>[] classes, Map<String, Object> constants) {
try {
String id = toId(source, projection.getJavaClass(), types);
String id = toId(source, projection.getJavaClass(), types, constants.values());
Class<?> clazz;
try {
clazz = loader.loadClass(id);
@ -106,13 +107,16 @@ public abstract class AbstractEvaluatorFactory implements EvaluatorFactory{
}
protected String toId(String source, Class<?> returnType, Type... types) {
protected String toId(String source, Class<?> returnType, Type[] types, Collection<Object> constants) {
StringBuilder b = new StringBuilder("Q");
b.append("_").append(source.hashCode());
b.append("_").append(returnType.getName().hashCode());
for (Type type : types) {
b.append("_").append(type.getFullName().hashCode());
}
for (Object constant : constants) {
b.append("_").append(constant.getClass().getName().hashCode());
}
return b.toString().replace('-', '0');
}

45
src/test/java/com/mysema/codegen/ComplexEvaluationTest.java
View File

@ -160,4 +160,49 @@ public class ComplexEvaluationTest {
assertEquals(Arrays.asList(true, true, true), evaluator.evaluate(a_, b_));
}
public static class SuperCat extends Cat {
private SuperCat(String name) {
super(name);
}
}
@Test
public void ComplexDifferentConstants() {
ClassType resultType = new ClassType(TypeCategory.LIST, List.class, new ClassType(Cat.class));
String source = new StringBuilder()
.append("java.util.List<com.mysema.codegen.support.Cat> rv = new java.util.ArrayList<com.mysema.codegen.support.Cat>();\n")
.append("for (com.mysema.codegen.support.Cat cat : (java.util.List<com.mysema.codegen.support.Cat>)cat_){\n")
.append("if (cat.equals(a1)) {\n")
.append("rv.add(cat);\n")
.append("}\n")
.append("}\n")
.append("return rv;\n")
.toString();
List<Cat> cats = Arrays.asList(new Cat("fuzzy"), new Cat("spot"));
String[] names = new String[] { "cat_" };
Type[] types = new Type[] { new ClassType(TypeCategory.LIST, List.class, new ClassType(Cat.class)) };
Class<?>[] classes = new Class[] { List.class };
// first pass
factory.createEvaluator(
source,
resultType,
names,
types,
classes,
Collections.singletonMap("a1", (Object) new SuperCat("superMittens"))
).evaluate(cats);
// second pass
factory.createEvaluator(
source,
resultType,
names,
types,
classes,
Collections.singletonMap("a1", (Object) new Cat("normalMittens"))
).evaluate(cats);
}
}