Merge pull request #1282 from querydsl/reflection-enumvalues

Remove unnecessary reflection code from JavaTemplates
This commit is contained in:
Timo Westkämper 2015-03-28 23:13:32 +02:00
commit 3928a8b6ff
2 changed files with 9 additions and 23 deletions

View File

@ -13,9 +13,6 @@
*/
package com.querydsl.core.types;
import java.lang.reflect.Field;
/**
* JavaTemplates extends {@link Templates} to provide Java syntax compliant serialization
* of Querydsl expressions
@ -101,13 +98,8 @@ public class JavaTemplates extends Templates {
add(Ops.CASE_EQ_ELSE, "{0}");
// Math
try {
for (Field f : Ops.MathOps.class.getFields()) {
Operator op = (Operator) f.get(null);
add(op, "Math." + getTemplate(op));
}
} catch (IllegalAccessException e) {
throw new RuntimeException(e.getMessage(), e);
for (Operator op : Ops.MathOps.values()) {
add(op, "Math." + getTemplate(op));
}
add(Ops.MOD, "{0} % {0}");

View File

@ -16,27 +16,21 @@ package com.querydsl.core.serialization;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Field;
import org.junit.Test;
import com.querydsl.core.types.JavaTemplates;
import com.querydsl.core.types.Operator;
import com.querydsl.core.types.Ops;
import com.querydsl.core.types.*;
public class JavaTemplatesTest {
@Test
public void Mappings() throws IllegalArgumentException, IllegalAccessException {
JavaTemplates templates = new JavaTemplates();
public void Mappings() {
Templates templates = new JavaTemplates();
int matched = 0;
for (Field field : Ops.class.getFields()) {
if (Operator.class.isAssignableFrom(field.getType())) {
matched++;
Operator operator = (Operator) field.get(null);
assertNotNull(field.getName() + " missing", templates.getTemplate(operator));
}
for (Operator operator : Ops.values()) {
++matched;
assertNotNull(templates.getTemplate(operator));
}
assertTrue(matched > 0);
}