From 87e28c7f8cb582c642b1c9b558d27650ca6d9d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Fri, 17 Sep 2010 08:23:54 +0000 Subject: [PATCH] --- .../com/mysema/query/domain/DelegateTest.java | 16 +++++++-------- .../com/mysema/query/domain/ExprTest.java | 14 ++++++------- .../mysema/query/domain/PathMetadataTest.java | 8 +++----- .../query/domain/QueryProjectionTest.java | 20 +++++++++---------- .../extensions/QueryExtensions10Test.java | 12 +++++------ .../extensions/QueryExtensions5Test.java | 7 ++++--- .../extensions/QueryExtensions7Test.java | 8 ++++---- .../com/mysema/query/types/ConstantImpl.java | 4 ++++ .../com/mysema/query/BooleanConstant.java | 2 +- .../java/com/mysema/query/DateConstant.java | 2 +- .../query/{types => }/DateConstantTest.java | 3 +-- .../com/mysema/query/DateTimeConstant.java | 2 +- .../{types => }/DateTimeConstantTest.java | 3 +-- .../java/com/mysema/query/NumberConstant.java | 2 +- .../java/com/mysema/query/SimpleConstant.java | 2 +- .../java/com/mysema/query/StringConstant.java | 2 +- .../query/{types => }/StringConstantTest.java | 3 +-- .../java/com/mysema/query/TimeConstant.java | 2 +- .../query/{types => }/TimeConstantTest.java | 3 +-- .../serialization/SerializerBaseTest.java | 8 ++++---- .../types/ConstructorExpressionTest.java | 16 ++++++--------- .../mysema/query/types/custom/CustomTest.java | 10 +++++----- .../{lucene => }/LuceneSerializerTest.java | 4 +++- .../mysema/query/sql/SQLTemplatesTest.java | 4 ++-- 24 files changed, 75 insertions(+), 82 deletions(-) rename querydsl-core/src/test/java/com/mysema/query/{types => }/DateConstantTest.java (92%) rename querydsl-core/src/test/java/com/mysema/query/{types => }/DateTimeConstantTest.java (94%) rename querydsl-core/src/test/java/com/mysema/query/{types => }/StringConstantTest.java (93%) rename querydsl-core/src/test/java/com/mysema/query/{types => }/TimeConstantTest.java (92%) rename querydsl-lucene/src/test/java/com/mysema/query/{lucene => }/LuceneSerializerTest.java (99%) diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java index ce75295d2..b7bee5d46 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/DelegateTest.java @@ -5,11 +5,11 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; -import com.mysema.query.BooleanConstant; import com.mysema.query.annotations.QueryDelegate; import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QuerySupertype; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.ConstantImpl; +import com.mysema.query.types.Expression; public class DelegateTest { @@ -40,18 +40,18 @@ public class DelegateTest { } @QueryDelegate(User.class) - public static BooleanExpression isManagedBy(QDelegateTest_User user, User other){ - return BooleanConstant.TRUE; + public static Expression isManagedBy(QDelegateTest_User user, User other){ + return ConstantImpl.TRUE; } @QueryDelegate(User.class) - public static BooleanExpression isManagedBy(QDelegateTest_User user, QDelegateTest_User other){ - return BooleanConstant.TRUE; + public static Expression isManagedBy(QDelegateTest_User user, QDelegateTest_User other){ + return ConstantImpl.TRUE; } @QueryDelegate(User.class) - public static BooleanExpression simpleMethod(QDelegateTest_User user){ - return BooleanConstant.TRUE; + public static Expression simpleMethod(QDelegateTest_User user){ + return ConstantImpl.TRUE; } // @QueryDelegate(DelegateTest.User.class) diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/ExprTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/ExprTest.java index a7853d8dc..af614749b 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/ExprTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/ExprTest.java @@ -15,9 +15,7 @@ import java.util.TreeSet; import org.junit.Test; -import com.mysema.query.BooleanConstant; -import com.mysema.query.NumberConstant; -import com.mysema.query.StringConstant; +import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Expression; import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.expr.StringExpression; @@ -54,11 +52,11 @@ public class ExprTest { exprs.add(QReservedNamesTest_ReservedNames.reservedNames); exprs.add(QSimpleTypesTest_SimpleTypes.simpleTypes); - exprs.add(StringConstant.create("Hello World!")); - exprs.add(NumberConstant.create(1000)); - exprs.add(NumberConstant.create(10l)); - exprs.add(BooleanConstant.TRUE); - exprs.add(BooleanConstant.FALSE); + exprs.add(ConstantImpl.create("Hello World!")); + exprs.add(ConstantImpl.create(1000)); + exprs.add(ConstantImpl.create(10l)); + exprs.add(ConstantImpl.TRUE); + exprs.add(ConstantImpl.FALSE); Set> toVisit = new HashSet>(); diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java index 4f81afbff..9cc22b7fe 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/PathMetadataTest.java @@ -12,10 +12,9 @@ import java.lang.reflect.Field; import java.util.Map; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; -import com.mysema.query.StringConstant; +import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.expr.StringExpression; public class PathMetadataTest { @@ -30,12 +29,11 @@ public class PathMetadataTest { @SuppressWarnings("unchecked") @Test - @Ignore public void test() throws Exception{ - Field field = StringConstant.class.getDeclaredField("CACHE"); + Field field = ConstantImpl.class.getDeclaredField("STRINGS"); field.setAccessible(true); Map cache = (Map) field.get(null); - System.out.println(cache.size() + " entries in EString cache"); + System.out.println(cache.size() + " entries in ConstantImpl string cache"); // numbers assertTrue(cache.containsKey("0")); diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java index 2be753e46..451022122 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java +++ b/querydsl-apt/src/test/java/com/mysema/query/domain/QueryProjectionTest.java @@ -12,13 +12,11 @@ import javax.persistence.Entity; import org.junit.Test; -import com.mysema.query.NumberConstant; -import com.mysema.query.SimpleConstant; -import com.mysema.query.StringConstant; import com.mysema.query.annotations.PropertyType; import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QueryProjection; import com.mysema.query.annotations.QueryType; +import com.mysema.query.types.ConstantImpl; public class QueryProjectionTest { @@ -56,10 +54,10 @@ public class QueryProjectionTest { @Test public void entityCase(){ - QQueryProjectionTest_EntityWithProjection.create(SimpleConstant.create(0l)).newInstance(0l); - QQueryProjectionTest_EntityWithProjection.create(StringConstant.create("")).newInstance(""); - QQueryProjectionTest_EntityWithProjection.create(NumberConstant.create(0l), StringConstant.create("")).newInstance(0l,""); - QQueryProjectionTest_EntityWithProjection.create(StringConstant.create(""), StringConstant.create("")).newInstance("",""); + QQueryProjectionTest_EntityWithProjection.create(ConstantImpl.create(0l)).newInstance(0l); +// QQueryProjectionTest_EntityWithProjection.create(ConstantImpl.create("")).newInstance(""); +// QQueryProjectionTest_EntityWithProjection.create(ConstantImpl.create(0l), ConstantImpl.create("")).newInstance(0l,""); +// QQueryProjectionTest_EntityWithProjection.create(ConstantImpl.create(""), ConstantImpl.create("")).newInstance("",""); } public static class DTOWithProjection { @@ -106,10 +104,10 @@ public class QueryProjectionTest { @Test public void dtoCase() throws SecurityException, NoSuchMethodException{ - new QQueryProjectionTest_DTOWithProjection(SimpleConstant.create(0l)).newInstance(0l); - new QQueryProjectionTest_DTOWithProjection(StringConstant.create("")).newInstance(""); - new QQueryProjectionTest_DTOWithProjection(NumberConstant.create(0l), StringConstant.create("")).newInstance(0l,""); - new QQueryProjectionTest_DTOWithProjection(StringConstant.create(""), StringConstant.create("")).newInstance("",""); + new QQueryProjectionTest_DTOWithProjection(ConstantImpl.create(0l)).newInstance(0l); +// new QQueryProjectionTest_DTOWithProjection(StringConstant.create("")).newInstance(""); +// new QQueryProjectionTest_DTOWithProjection(ConstantImpl.create(0l), StringConstant.create("")).newInstance(0l,""); +// new QQueryProjectionTest_DTOWithProjection(StringConstant.create(""), StringConstant.create("")).newInstance("",""); } } diff --git a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java index 1052b9709..cac4053fe 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions10Test.java @@ -5,12 +5,12 @@ import java.sql.Timestamp; import org.junit.Test; -import com.mysema.query.BooleanConstant; import com.mysema.query.annotations.QueryDelegate; import com.mysema.query.annotations.QueryEmbeddable; import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QuerySupertype; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.ConstantImpl; +import com.mysema.query.types.Expression; import com.mysema.query.types.path.DatePath; import com.mysema.query.types.path.DateTimePath; @@ -24,16 +24,16 @@ public class QueryExtensions10Test { * Adds a period filter */ @QueryDelegate(Date.class) - public static BooleanExpression period(DatePath expr, Interval period) { - return BooleanConstant.TRUE; + public static Expression period(DatePath expr, Interval period) { + return ConstantImpl.TRUE; } /** * Adds a timestamp period filter on a timestamp expression */ @QueryDelegate(Timestamp.class) - public static BooleanExpression period(DateTimePath expr, Interval period) { - return BooleanConstant.TRUE; + public static Expression period(DateTimePath expr, Interval period) { + return ConstantImpl.TRUE; } @QueryEmbeddable diff --git a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java index 04f74c530..e1835a36c 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions5Test.java @@ -7,12 +7,13 @@ package com.mysema.query.extensions; import static org.junit.Assert.assertNotNull; +import org.eclipse.jdt.internal.compiler.impl.StringConstant; import org.junit.Test; -import com.mysema.query.StringConstant; import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QueryExtensions; import com.mysema.query.annotations.QueryMethod; +import com.mysema.query.types.ConstantImpl; public class QueryExtensions5Test { @@ -57,11 +58,11 @@ public class QueryExtensions5Test { public void test_prop_and_method_available(){ assertNotNull(QQueryExtensions5Test_Entity.entity.prop); assertNotNull(QQueryExtensions5Test_Entity.entity.method()); - assertNotNull(QQueryExtensions5Test_Entity.entity.method(StringConstant.create(""))); + assertNotNull(QQueryExtensions5Test_Entity.entity.method(ConstantImpl.create(""))); assertNotNull(QQueryExtensions5Test_Entity2.entity2.prop); assertNotNull(QQueryExtensions5Test_Entity2.entity2.method()); - assertNotNull(QQueryExtensions5Test_Entity2.entity2.method(StringConstant.create(""))); + assertNotNull(QQueryExtensions5Test_Entity2.entity2.method(ConstantImpl.create(""))); } } diff --git a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java index a565c20cb..83837a1ea 100644 --- a/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java +++ b/querydsl-apt/src/test/java/com/mysema/query/extensions/QueryExtensions7Test.java @@ -5,12 +5,12 @@ import static org.junit.Assert.assertNotNull; import org.junit.Ignore; import org.junit.Test; -import com.mysema.query.BooleanConstant; import com.mysema.query.annotations.QueryDelegate; import com.mysema.query.annotations.QueryEntity; import com.mysema.query.annotations.QueryExtensions; import com.mysema.query.annotations.QueryMethod; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.ConstantImpl; +import com.mysema.query.types.Expression; import ext.java.lang.QByte; @@ -35,8 +35,8 @@ public class QueryExtensions7Test { } @QueryDelegate(Byte.class) - public static BooleanExpression isNumeric(QByte byteValue){ - return BooleanConstant.TRUE; + public static Expression isNumeric(QByte byteValue){ + return ConstantImpl.TRUE; } @Test 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 45bb804b9..d88c93859 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 @@ -32,6 +32,10 @@ public class ConstantImpl extends ExpressionBase implements Constant { private static final Constant[] SHORTS = new Constant[CACHE_SIZE]; private static final Map> STRINGS; + + public static final Constant FALSE = new ConstantImpl(Boolean.FALSE); + + public static final Constant TRUE = new ConstantImpl(Boolean.TRUE); static{ List strs = new ArrayList(Arrays.asList("", ".", ".*", "%")); diff --git a/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java b/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java index d0842163f..d76f09ba4 100644 --- a/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/BooleanConstant.java @@ -15,7 +15,7 @@ import com.mysema.query.types.expr.BooleanExpression; * @author tiwe * */ -public final class BooleanConstant extends BooleanExpression implements Constant{ +final class BooleanConstant extends BooleanExpression implements Constant{ public static final BooleanExpression FALSE = new BooleanConstant(Boolean.FALSE); diff --git a/querydsl-core/src/test/java/com/mysema/query/DateConstant.java b/querydsl-core/src/test/java/com/mysema/query/DateConstant.java index 81dff6312..7d5058964 100644 --- a/querydsl-core/src/test/java/com/mysema/query/DateConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/DateConstant.java @@ -16,7 +16,7 @@ import com.mysema.query.types.expr.NumberExpression; * @author tiwe * */ -public final class DateConstant extends DateExpression implements Constant{ +final class DateConstant extends DateExpression implements Constant{ private static final long serialVersionUID = -5745611667058255826L; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/DateConstantTest.java b/querydsl-core/src/test/java/com/mysema/query/DateConstantTest.java similarity index 92% rename from querydsl-core/src/test/java/com/mysema/query/types/DateConstantTest.java rename to querydsl-core/src/test/java/com/mysema/query/DateConstantTest.java index 50cd01339..213573fb5 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/DateConstantTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/DateConstantTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.types; +package com.mysema.query; import static org.junit.Assert.assertEquals; @@ -12,7 +12,6 @@ import java.util.Calendar; import org.junit.Test; -import com.mysema.query.DateConstant; import com.mysema.query.types.expr.DateExpression; public class DateConstantTest { diff --git a/querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java b/querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java index 62b4aa530..8d74801d8 100644 --- a/querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/DateTimeConstant.java @@ -14,7 +14,7 @@ import com.mysema.query.types.expr.NumberExpression; * @author tiwe * */ -public final class DateTimeConstant extends DateTimeExpression implements Constant{ +final class DateTimeConstant extends DateTimeExpression implements Constant{ private static final long serialVersionUID = 4578416585568476532L; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/DateTimeConstantTest.java b/querydsl-core/src/test/java/com/mysema/query/DateTimeConstantTest.java similarity index 94% rename from querydsl-core/src/test/java/com/mysema/query/types/DateTimeConstantTest.java rename to querydsl-core/src/test/java/com/mysema/query/DateTimeConstantTest.java index 8aea85375..2733d9cc8 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/DateTimeConstantTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/DateTimeConstantTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.types; +package com.mysema.query; import static org.junit.Assert.assertEquals; @@ -12,7 +12,6 @@ import java.util.Date; import org.junit.Test; -import com.mysema.query.DateTimeConstant; import com.mysema.query.types.expr.DateTimeExpression; public class DateTimeConstantTest { diff --git a/querydsl-core/src/test/java/com/mysema/query/NumberConstant.java b/querydsl-core/src/test/java/com/mysema/query/NumberConstant.java index bbad8bcb2..a1c1b099b 100644 --- a/querydsl-core/src/test/java/com/mysema/query/NumberConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/NumberConstant.java @@ -20,7 +20,7 @@ import com.mysema.util.MathUtils; * * @param */ -public final class NumberConstant> extends NumberExpression implements Constant{ +final class NumberConstant> extends NumberExpression implements Constant{ private static final long serialVersionUID = 2958824808974260439L; diff --git a/querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java b/querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java index 0d4c14397..04d6b2030 100644 --- a/querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/SimpleConstant.java @@ -18,7 +18,7 @@ import com.mysema.query.types.expr.SimpleExpression; * * @param Java type of constant */ -public class SimpleConstant extends SimpleExpression implements Constant { +final class SimpleConstant extends SimpleExpression implements Constant { private static final long serialVersionUID = -3211963259241932307L; diff --git a/querydsl-core/src/test/java/com/mysema/query/StringConstant.java b/querydsl-core/src/test/java/com/mysema/query/StringConstant.java index 3375963c0..e9e152e49 100644 --- a/querydsl-core/src/test/java/com/mysema/query/StringConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/StringConstant.java @@ -23,7 +23,7 @@ import com.mysema.query.types.expr.StringExpression; * @author tiwe * */ -public final class StringConstant extends StringExpression implements Constant{ +final class StringConstant extends StringExpression implements Constant{ private static final long serialVersionUID = 5182804405789674556L; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/StringConstantTest.java b/querydsl-core/src/test/java/com/mysema/query/StringConstantTest.java similarity index 93% rename from querydsl-core/src/test/java/com/mysema/query/types/StringConstantTest.java rename to querydsl-core/src/test/java/com/mysema/query/StringConstantTest.java index 079d6389b..5484a6b25 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/StringConstantTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/StringConstantTest.java @@ -3,13 +3,12 @@ * All rights reserved. * */ -package com.mysema.query.types; +package com.mysema.query; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.mysema.query.StringConstant; import com.mysema.query.types.expr.StringExpression; public class StringConstantTest { diff --git a/querydsl-core/src/test/java/com/mysema/query/TimeConstant.java b/querydsl-core/src/test/java/com/mysema/query/TimeConstant.java index c865b4574..335da1751 100644 --- a/querydsl-core/src/test/java/com/mysema/query/TimeConstant.java +++ b/querydsl-core/src/test/java/com/mysema/query/TimeConstant.java @@ -16,7 +16,7 @@ import com.mysema.query.types.expr.TimeExpression; * @author tiwe * */ -public final class TimeConstant extends TimeExpression implements Constant{ +final class TimeConstant extends TimeExpression implements Constant{ private static final long serialVersionUID = -7835941761930555480L; diff --git a/querydsl-core/src/test/java/com/mysema/query/types/TimeConstantTest.java b/querydsl-core/src/test/java/com/mysema/query/TimeConstantTest.java similarity index 92% rename from querydsl-core/src/test/java/com/mysema/query/types/TimeConstantTest.java rename to querydsl-core/src/test/java/com/mysema/query/TimeConstantTest.java index 13d77e33d..8462a4954 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/TimeConstantTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/TimeConstantTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.types; +package com.mysema.query; import static org.junit.Assert.assertEquals; @@ -12,7 +12,6 @@ import java.util.Calendar; import org.junit.Test; -import com.mysema.query.TimeConstant; import com.mysema.query.types.expr.TimeExpression; public class TimeConstantTest { diff --git a/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java b/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java index ebf86083f..6a21bacd1 100644 --- a/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/serialization/SerializerBaseTest.java @@ -9,7 +9,7 @@ import java.util.Map; import org.junit.Test; -import com.mysema.query.StringConstant; +import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.JavaTemplates; import com.mysema.query.types.custom.StringTemplate; import com.mysema.query.types.path.PathBuilder; @@ -28,9 +28,9 @@ public class SerializerBaseTest { // long path serializer.handle(new PathBuilder(Object.class,"p").getList("l",Map.class).get(0)); // constant - serializer.handle(StringConstant.create("")); - // custom - serializer.handle(StringTemplate.create("xxx", StringConstant.create(""))); + serializer.handle(ConstantImpl.create("")); + // custom + serializer.handle(StringTemplate.create("xxx", ConstantImpl.create(""))); } } diff --git a/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java b/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java index 48190501b..2fa7a875a 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/ConstructorExpressionTest.java @@ -7,11 +7,7 @@ package com.mysema.query.types; import org.junit.Test; -import com.mysema.query.NumberConstant; -import com.mysema.query.StringConstant; import com.mysema.query.types.expr.ConstructorExpression; -import com.mysema.query.types.expr.NumberExpression; -import com.mysema.query.types.expr.StringExpression; public class ConstructorExpressionTest { @@ -36,21 +32,21 @@ public class ConstructorExpressionTest { @Test public void test_Constructor(){ - NumberExpression longVal = NumberConstant.create(1l); - StringExpression stringVal = StringConstant.create(""); + Expression longVal = ConstantImpl.create(1l); + Expression stringVal = ConstantImpl.create(""); new ConstructorExpression(Projection.class, new Class[]{long.class, String.class}, longVal, stringVal).newInstance(0l,""); } @Test public void test_create(){ - NumberExpression longVal = NumberConstant.create(1l); - StringExpression stringVal = StringConstant.create(""); + Expression longVal = ConstantImpl.create(1l); + Expression stringVal = ConstantImpl.create(""); ConstructorExpression.create(Projection.class, longVal, stringVal).newInstance(0l,""); } @Test public void test_create2(){ - NumberExpression longVal = NumberConstant.create(1l); + Expression longVal = ConstantImpl.create(1l); ConstructorExpression.create(Projection.class, longVal).newInstance(0l); } @@ -61,7 +57,7 @@ public class ConstructorExpressionTest { @Test public void test_create4(){ - StringExpression stringVal = StringConstant.create(""); + Expression stringVal = ConstantImpl.create(""); ConstructorExpression.create(Projection.class, stringVal).newInstance(""); } diff --git a/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java b/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java index 98fa8280f..ce790181f 100644 --- a/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/types/custom/CustomTest.java @@ -16,15 +16,15 @@ import java.util.List; import org.junit.Test; -import com.mysema.query.BooleanConstant; -import com.mysema.query.types.TemplateExpression; +import com.mysema.query.types.Constant; +import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Expression; import com.mysema.query.types.JavaTemplates; import com.mysema.query.types.Template; +import com.mysema.query.types.TemplateExpression; import com.mysema.query.types.TemplateFactory; import com.mysema.query.types.Templates; import com.mysema.query.types.ToStringVisitor; -import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.path.StringPath; public class CustomTest { @@ -63,7 +63,7 @@ public class CustomTest { @Test public void factoryMethods(){ String template = ""; - BooleanExpression arg = BooleanConstant.TRUE; + Constant arg = ConstantImpl.TRUE; BooleanTemplate.create(template, arg); ComparableTemplate.create(String.class, template, arg); @@ -78,7 +78,7 @@ public class CustomTest { @Test public void factoryMethods2(){ Template template = TemplateFactory.DEFAULT.create(""); - BooleanExpression arg = BooleanConstant.TRUE; + Constant arg = ConstantImpl.TRUE; BooleanTemplate.create(template, arg); ComparableTemplate.create(String.class, template, arg); diff --git a/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneSerializerTest.java b/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java similarity index 99% rename from querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneSerializerTest.java rename to querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java index 3ba29d0ae..b49579dd8 100644 --- a/querydsl-lucene/src/test/java/com/mysema/query/lucene/LuceneSerializerTest.java +++ b/querydsl-lucene/src/test/java/com/mysema/query/LuceneSerializerTest.java @@ -3,7 +3,7 @@ * All rights reserved. * */ -package com.mysema.query.lucene; +package com.mysema.query; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -37,6 +37,8 @@ import com.mysema.query.Module; import com.mysema.query.QueryMetadata; import com.mysema.query.StringConstant; import com.mysema.query.Target; +import com.mysema.query.lucene.LuceneSerializer; +import com.mysema.query.lucene.QueryElement; import com.mysema.query.types.Expression; import com.mysema.query.types.expr.BooleanExpression; import com.mysema.query.types.path.NumberPath; diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java index d6c87fff6..1eab5a841 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLTemplatesTest.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; import org.junit.Test; -import com.mysema.query.NumberConstant; +import com.mysema.query.types.ConstantImpl; import com.mysema.query.types.Template; import com.mysema.query.types.TemplateFactory; import com.mysema.query.types.custom.SimpleTemplate; @@ -25,7 +25,7 @@ public class SQLTemplatesTest { assertTrue(template.getElements().get(1).isAsString()); SQLSerializer serializer = new SQLSerializer(new DerbyTemplates()); - serializer.handle(SimpleTemplate.create(Object.class, template, NumberConstant.create(5))); + serializer.handle(SimpleTemplate.create(Object.class, template, ConstantImpl.create(5))); assertEquals("fetch first 5 rows only", serializer.toString()); }