From 95fc0ea6fb2d86329e320e20fdf5ccf56e124833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Tue, 28 Sep 2010 20:14:33 +0000 Subject: [PATCH] replaced BooleanExpression with Predicate --- .../com/mysema/query/jpa/AbstractJPQLSubQuery.java | 4 ++-- .../java/com/mysema/query/jpa/JPQLCommonQuery.java | 4 ++-- .../main/java/com/mysema/query/jpa/JPQLQueryBase.java | 4 ++-- .../main/java/com/mysema/query/jpa/JPQLQueryMixin.java | 6 +++--- .../java/com/mysema/query/sql/oracle/OracleQuery.java | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java index a9e452a17..04551cfaf 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/AbstractJPQLSubQuery.java @@ -12,7 +12,7 @@ import com.mysema.query.QueryMetadata; import com.mysema.query.support.DetachableQuery; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Path; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.Predicate; import com.mysema.query.types.path.MapPath; /** @@ -137,7 +137,7 @@ public class AbstractJPQLSubQuery> extends Det return queryMixin.leftJoin(target, alias); } - public Q with(BooleanExpression... conditions){ + public Q with(Predicate... conditions){ return queryMixin.with(conditions); } diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java index b24043987..74546fba3 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLCommonQuery.java @@ -5,7 +5,7 @@ import java.util.Collection; import com.mysema.query.Query; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Path; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.Predicate; import com.mysema.query.types.path.MapPath; /** @@ -271,6 +271,6 @@ public interface JPQLCommonQuery> extends Query * @param condition * @return */ - Q with(BooleanExpression... condition); + Q with(Predicate... condition); } diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java index a24658b5e..55747fbaf 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryBase.java @@ -12,7 +12,7 @@ import com.mysema.query.QueryMetadata; import com.mysema.query.support.ProjectableQuery; import com.mysema.query.types.EntityPath; import com.mysema.query.types.Path; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.Predicate; import com.mysema.query.types.path.MapPath; /** @@ -171,7 +171,7 @@ public abstract class JPQLQueryBase> extends Projecta return queryMixin.leftJoin(target, alias); } - public Q with(BooleanExpression... conditions){ + public Q with(Predicate... conditions){ return queryMixin.with(conditions); } diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java index 6fe51fb19..06103aca9 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLQueryMixin.java @@ -11,7 +11,7 @@ import com.mysema.query.JoinExpression; import com.mysema.query.JoinFlag; import com.mysema.query.QueryMetadata; import com.mysema.query.support.QueryMixin; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.Predicate; /** * JPQLQueryMixin extends QueryMixin to support JPQL join construction @@ -48,8 +48,8 @@ public class JPQLQueryMixin extends QueryMixin { return getSelf(); } - public T with(BooleanExpression... conditions){ - for (BooleanExpression condition : conditions){ + public T with(Predicate... conditions){ + for (Predicate condition : conditions){ getMetadata().addJoinCondition(condition); } return getSelf(); diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java b/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java index 0c3ad154c..85ee514fc 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/oracle/OracleQuery.java @@ -15,7 +15,7 @@ import com.mysema.query.sql.Configuration; import com.mysema.query.sql.OracleTemplates; import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.Expression; -import com.mysema.query.types.expr.BooleanExpression; +import com.mysema.query.types.Predicate; /** * OracleQuery provides Oracle specific extensions to the base SQL query type @@ -47,19 +47,19 @@ public class OracleQuery extends AbstractSQLQuery { super(conn, new Configuration(templates), metadata); } - public OracleQuery connectByPrior(BooleanExpression cond) { + public OracleQuery connectByPrior(Predicate cond) { return addFlag(Position.BEFORE_ORDER, CONNECT_BY_PRIOR, cond); } - public OracleQuery connectBy(BooleanExpression cond) { + public OracleQuery connectBy(Predicate cond) { return addFlag(Position.BEFORE_ORDER, CONNECT_BY, cond); } - public OracleQuery connectByNocyclePrior(BooleanExpression cond) { + public OracleQuery connectByNocyclePrior(Predicate cond) { return addFlag(Position.BEFORE_ORDER, CONNECT_BY_NOCYCLE_PRIOR, cond); } - public OracleQuery startWith(BooleanExpression cond) { + public OracleQuery startWith(Predicate cond) { return addFlag(Position.BEFORE_ORDER, START_WITH, cond); }