From c70893fdcd38e5f809fb8393c36527869b8a69ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Thu, 16 Sep 2010 08:18:31 +0000 Subject: [PATCH] --- .../com/mysema/query/types/ConstantImpl.java | 4 +++ .../com/mysema/query/types/Converters.java | 32 +++++++++---------- .../query/types/PathMetadataFactory.java | 8 ++--- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java b/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java index 5833a762e..ed2584e17 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ConstantImpl.java @@ -101,6 +101,10 @@ public class ConstantImpl extends ExpressionBase implements Constant { return rv; } } + +// public static Constant create(C value){ +// return new ConstantImpl(value); +// } private final T constant; diff --git a/querydsl-core/src/main/java/com/mysema/query/types/Converters.java b/querydsl-core/src/main/java/com/mysema/query/types/Converters.java index 20c0e02eb..1c2fe4731 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/Converters.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/Converters.java @@ -21,7 +21,7 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl(arg.toString().toLowerCase()); + return ConstantImpl.create(arg.toString().toLowerCase()); }else{ return new OperationImpl(String.class, Ops.LOWER, arg); } @@ -32,7 +32,7 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl(arg.toString().toUpperCase()); + return ConstantImpl.create(arg.toString().toUpperCase()); }else{ return new OperationImpl(String.class, Ops.UPPER, arg); } @@ -43,9 +43,9 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl(escapeForLike((Constant)arg) + "%"); + return ConstantImpl.create(escapeForLike((Constant)arg) + "%"); }else{ - return new OperationImpl(String.class, Ops.CONCAT, arg, new ConstantImpl("%")); + return new OperationImpl(String.class, Ops.CONCAT, arg, ConstantImpl.create("%")); } } }; @@ -54,9 +54,9 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl(escapeForLike((Constant)arg).toLowerCase() + "%"); + return ConstantImpl.create(escapeForLike((Constant)arg).toLowerCase() + "%"); }else{ - Expression concated = new OperationImpl(String.class, Ops.CONCAT, arg, new ConstantImpl("%")); + Expression concated = new OperationImpl(String.class, Ops.CONCAT, arg, ConstantImpl.create("%")); return new OperationImpl(String.class, Ops.LOWER, concated); } } @@ -66,9 +66,9 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl("%" + escapeForLike((Constant)arg)); + return ConstantImpl.create("%" + escapeForLike((Constant)arg)); }else{ - return new OperationImpl(String.class, Ops.CONCAT, new ConstantImpl("%"), arg); + return new OperationImpl(String.class, Ops.CONCAT, ConstantImpl.create("%"), arg); } } }; @@ -77,9 +77,9 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl("%" + escapeForLike((Constant)arg).toLowerCase()); + return ConstantImpl.create("%" + escapeForLike((Constant)arg).toLowerCase()); }else{ - Expression concated = new OperationImpl(String.class, Ops.CONCAT, new ConstantImpl("%"), arg); + Expression concated = new OperationImpl(String.class, Ops.CONCAT, ConstantImpl.create("%"), arg); return new OperationImpl(String.class, Ops.LOWER, concated); } } @@ -89,10 +89,10 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl("%" + escapeForLike((Constant)arg) + "%"); + return ConstantImpl.create("%" + escapeForLike((Constant)arg) + "%"); }else{ - Expression concated = new OperationImpl(String.class, Ops.CONCAT, new ConstantImpl("%"), arg); - return new OperationImpl(String.class, Ops.CONCAT, concated, new ConstantImpl("%")); + Expression concated = new OperationImpl(String.class, Ops.CONCAT, ConstantImpl.create("%"), arg); + return new OperationImpl(String.class, Ops.CONCAT, concated, ConstantImpl.create("%")); } } }; @@ -101,10 +101,10 @@ public final class Converters { @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ - return new ConstantImpl("%" + escapeForLike((Constant)arg).toLowerCase() + "%"); + return ConstantImpl.create("%" + escapeForLike((Constant)arg).toLowerCase() + "%"); }else{ - Expression concated = new OperationImpl(String.class, Ops.CONCAT, new ConstantImpl("%"), arg); - concated = new OperationImpl(String.class, Ops.CONCAT, concated, new ConstantImpl("%")); + Expression concated = new OperationImpl(String.class, Ops.CONCAT, ConstantImpl.create("%"), arg); + concated = new OperationImpl(String.class, Ops.CONCAT, concated, ConstantImpl.create("%")); return new OperationImpl(String.class, Ops.LOWER, concated); } } diff --git a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java index 9a3930525..70b8a4503 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/PathMetadataFactory.java @@ -20,7 +20,7 @@ public final class PathMetadataFactory { } public static PathMetadata forArrayAccess(Path parent, @Nonnegative int index) { - return new PathMetadata(parent, new ConstantImpl(index), PathType.ARRAYVALUE_CONSTANT); + return new PathMetadata(parent, ConstantImpl.create(index), PathType.ARRAYVALUE_CONSTANT); } public static PathMetadata forListAccess(Path parent, Expression index) { @@ -28,7 +28,7 @@ public final class PathMetadataFactory { } public static PathMetadata forListAccess(Path parent, @Nonnegative int index) { - return new PathMetadata(parent, new ConstantImpl(index), PathType.LISTVALUE_CONSTANT); + return new PathMetadata(parent, ConstantImpl.create(index), PathType.LISTVALUE_CONSTANT); } public static PathMetadata forMapAccess(Path parent, Expression key) { @@ -40,11 +40,11 @@ public final class PathMetadataFactory { } public static PathMetadata forProperty(Path parent, String property) { - return new PathMetadata(parent, new ConstantImpl(Assert.hasLength(property,"property")), PathType.PROPERTY); + return new PathMetadata(parent, ConstantImpl.create(Assert.hasLength(property,"property"), true), PathType.PROPERTY); } public static PathMetadata forVariable(String variable) { - return new PathMetadata(null, new ConstantImpl(Assert.hasLength(variable,"variable")), PathType.VARIABLE); + return new PathMetadata(null, ConstantImpl.create(Assert.hasLength(variable,"variable"), true), PathType.VARIABLE); } private PathMetadataFactory(){}