diff --git a/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java b/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java index 84b73dd0e..92072d84e 100644 --- a/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java +++ b/querydsl-core/src/main/java/com/mysema/query/BooleanBuilder.java @@ -47,6 +47,12 @@ public final class BooleanBuilder implements Predicate, Cloneable, Operation,Expression> toLowerCase = new Transformer,Expression>(){ + public final Transformer,Expression> toLowerCase = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -31,7 +39,8 @@ public final class Converters { } }; - public final Transformer,Expression> toUpperCase = new Transformer,Expression>(){ + public final Transformer,Expression> toUpperCase = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -42,7 +51,8 @@ public final class Converters { } }; - public final Transformer,Expression> toStartsWithViaLike = new Transformer,Expression>(){ + public final Transformer,Expression> toStartsWithViaLike = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -53,7 +63,8 @@ public final class Converters { } }; - public final Transformer,Expression> toStartsWithViaLikeLower = new Transformer,Expression>(){ + public final Transformer,Expression> toStartsWithViaLikeLower = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -65,7 +76,8 @@ public final class Converters { } }; - public final Transformer,Expression> toEndsWithViaLike = new Transformer,Expression>(){ + public final Transformer,Expression> toEndsWithViaLike = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -76,7 +88,8 @@ public final class Converters { } }; - public final Transformer,Expression> toEndsWithViaLikeLower = new Transformer,Expression>(){ + public final Transformer,Expression> toEndsWithViaLikeLower = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -88,7 +101,8 @@ public final class Converters { } }; - public final Transformer,Expression> toContainsViaLike = new Transformer,Expression>(){ + public final Transformer,Expression> toContainsViaLike = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ @@ -100,7 +114,8 @@ public final class Converters { } }; - public final Transformer,Expression> toContainsViaLikeLower = new Transformer,Expression>(){ + public final Transformer,Expression> toContainsViaLikeLower = + new Transformer,Expression>(){ @Override public Expression transform(Expression arg) { if (arg instanceof Constant){ diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java index 02d5fd93f..4ee669177 100644 --- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java +++ b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java @@ -18,6 +18,12 @@ import javax.annotation.Nullable; */ public final class ExpressionUtils { + /** + * Create the intersection of the given arguments + * + * @param exprs + * @return + */ @Nullable public static Predicate allOf(Predicate... exprs){ Predicate rv = null; @@ -27,10 +33,23 @@ public final class ExpressionUtils { return rv; } + /** + * Create the intersection of the given arguments + * + * @param left + * @param right + * @return + */ public static Predicate and(Predicate left, Predicate right){ return new PredicateOperation(Ops.AND, left, right); } + /** + * Create the union of the given arguments + * + * @param exprs + * @return + */ @Nullable public static Predicate anyOf(Predicate... exprs){ Predicate rv = null; @@ -40,18 +59,50 @@ public final class ExpressionUtils { return rv; } + /** + * Create an alias expression (source as alias) with the given source and alias + * + * @param + * @param source + * @param alias + * @return + */ public static Expression as(Expression source, Path alias) { return new OperationImpl(alias.getType(), Ops.ALIAS, source, alias); } + /** + * Create an alias expression (source as alias) with the given source and alias + * + * @param + * @param source + * @param alias + * @return + */ public static Expression as(Expression source, String alias) { return as(source, new PathImpl(source.getType(), alias)); } + /** + * Create an left equals constant expression + * + * @param + * @param left + * @param constant + * @return + */ public static Predicate eqConst(Expression left, D constant) { return eq(left, new ConstantImpl(constant)); } + /** + * Create an left equals right expression + * + * @param + * @param left + * @param right + * @return + */ public static Predicate eq(Expression left, Expression right) { if (isPrimitive(left.getType())) { return new PredicateOperation(Ops.EQ_PRIMITIVE, left, right); @@ -60,10 +111,26 @@ public final class ExpressionUtils { } } + /** + * Create an left in right expression + * + * @param + * @param left + * @param right + * @return + */ public static Predicate in(Expression left, CollectionExpression right) { return new PredicateOperation(Ops.IN, left, right); } + /** + * Create an left in right expression + * + * @param + * @param left + * @param right + * @return + */ public static Predicate in(Expression left, Collection right) { if (right.size() == 1){ return eqConst(left, right.iterator().next()); @@ -72,10 +139,22 @@ public final class ExpressionUtils { } } + /** + * Create a left is null expression + * + * @param left + * @return + */ public static Predicate isNull(Expression left) { return new PredicateOperation(Ops.IS_NULL, left); } + /** + * Create a left is not null expression + * + * @param left + * @return + */ public static Predicate isNotNull(Expression left) { return new PredicateOperation(Ops.IS_NOT_NULL, left); } @@ -87,6 +166,12 @@ public final class ExpressionUtils { || Character.class.equals(type); } + /** + * Convert the given like pattern to a regex pattern + * + * @param expr + * @return + */ @SuppressWarnings("unchecked") public static Expression likeToRegex(Expression expr){ if (expr instanceof Constant){ @@ -123,10 +208,26 @@ public final class ExpressionUtils { } } + /** + * Create a left not equals constant expression + * + * @param + * @param left + * @param constant + * @return + */ public static Predicate neConst(Expression left, D constant) { return ne(left, new ConstantImpl(constant)); } + /** + * Create a left not equals right expression + * + * @param + * @param left + * @param right + * @return + */ public static Predicate ne(Expression left, Expression right) { if (isPrimitive(left.getType())) { return new PredicateOperation(Ops.NE_PRIMITIVE, left, right); @@ -135,6 +236,13 @@ public final class ExpressionUtils { } } + /** + * Create a left or right expression + * + * @param left + * @param right + * @return + */ public static Predicate or(Predicate left, Predicate right){ return new PredicateOperation(Ops.OR, left, right); }