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

Merge pull request #1078 from querydsl/validate_enum_conversion

Browse Source 
Validate whether an enum type is supplied in EnumConversion
This commit is contained in:
Timo Westkämper 2014-12-10 15:17:45 +02:00
commit 5d964f2e89
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
querydsl-core/src/main/java/com/mysema/query/support/EnumConversion.java
View File

@ -16,6 +16,7 @@ package com.mysema.query.support;
import java.util.Collections;
import java.util.List;
import com.google.common.base.Preconditions;
import com.mysema.query.types.Expression;
import com.mysema.query.types.FactoryExpressionBase;
import com.mysema.query.types.Visitor;
@ -34,16 +35,14 @@ public class EnumConversion<T> extends FactoryExpressionBase<T> {
private final List<Expression<?>> exprs;
private final Enum<?>[] values;
private final T[] values;
public EnumConversion(Expression<T> expr) {
super(expr.getType());
Class<? extends T> type = getType();
Preconditions.checkArgument(type.isEnum(), "%s is not an enum", type);
exprs = Collections.<Expression<?>>singletonList(expr);
try {
values = (Enum<?>[]) expr.getType().getMethod("values").invoke(null);
} catch (Exception e) {
throw new RuntimeException(e.getMessage(), e);
}
values = type.getEnumConstants();
}
@Override
@ -60,11 +59,15 @@ public class EnumConversion<T> extends FactoryExpressionBase<T> {
public T newInstance(Object... args) {
if (args[0] != null) {
if (args[0] instanceof String) {
return (T)Enum.valueOf((Class)getType(), (String)args[0]);
@SuppressWarnings("unchecked") //The expression type is an enum
T rv = (T) Enum.valueOf(getType().asSubclass(Enum.class), (String)args[0]);
return rv;
} else if (args[0] instanceof Number) {
return (T)values[((Number)args[0]).intValue()];
return values[((Number)args[0]).intValue()];
} else {
return (T)args[0];
@SuppressWarnings("unchecked")
T rv = (T)args[0];
return rv;
}
} else {
return null;

14
querydsl-core/src/test/java/com/mysema/query/support/EnumConversionTest.java
View File

@ -1,10 +1,12 @@
package com.mysema.query.support;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import static org.junit.Assert.fail;
import com.mysema.query.types.path.EnumPath;
import com.mysema.query.types.path.StringPath;
import org.junit.Test;
public class EnumConversionTest {
@ -23,4 +25,12 @@ public class EnumConversionTest {
EnumConversion<Color> conv = new EnumConversion<Color>(color);
assertEquals(Color.RED, conv.newInstance(2));
}
@Test(expected = IllegalArgumentException.class)
public void Illegal() {
StringPath string = new StringPath("path");
EnumConversion<String> conv = new EnumConversion<String>(string);
fail("EnumConversion successfully created for a non-enum type");
conv.newInstance(0);
}
}