diff --git a/querydsl-core/src/main/java/com/mysema/query/types/expr/Expr.java b/querydsl-core/src/main/java/com/mysema/query/types/expr/Expr.java index ca15f5526..dd5a7b8bc 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/expr/Expr.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/expr/Expr.java @@ -38,9 +38,7 @@ public abstract class Expr implements Serializable{ */ @SuppressWarnings("unchecked") public static Expr create(T val){ - if (val instanceof String){ - return (Expr)EString.create((String)val); - }else if (val instanceof Boolean){ + if (val instanceof Boolean){ return (Expr)EBoolean.create((Boolean)val); }else{ return new ExprConst(Assert.notNull(val,"val is null")); diff --git a/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java b/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java index 6b684479e..2366c248f 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/path/PathMetadata.java @@ -17,9 +17,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import com.mysema.commons.lang.Assert; import com.mysema.query.types.expr.ENumber; -import com.mysema.query.types.expr.EString; import com.mysema.query.types.expr.Expr; -import com.mysema.query.types.expr.ExprConst; import com.mysema.query.util.NotEmpty; /** @@ -54,15 +52,17 @@ public final class PathMetadata implements Serializable{ } public static PathMetadata forMapAccess(PMap parent, KT key) { - return new PathMetadata(parent,ExprConst.create(key), PathType.MAPVALUE_CONSTANT); + return new PathMetadata(parent, Expr.create(key), PathType.MAPVALUE_CONSTANT); } public static PathMetadata forProperty(Path parent, @NotEmpty String property) { - return new PathMetadata(parent, EString.create(Assert.hasLength(property)), PathType.PROPERTY); + // TODO : cache expressions ? + return new PathMetadata(parent, Expr.create(Assert.hasLength(property)), PathType.PROPERTY); } public static PathMetadata forVariable(@NotEmpty String variable) { - return new PathMetadata(null, EString.create(Assert.hasLength(variable)), PathType.VARIABLE); + // TODO : cache expressions ? + return new PathMetadata(null, Expr.create(Assert.hasLength(variable)), PathType.VARIABLE); } private final Expr expression;