diff --git a/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java b/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java index 2827ae341..267c82a9a 100644 --- a/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java +++ b/querydsl-core/src/main/java/com/mysema/query/CascadingBoolean.java @@ -31,8 +31,8 @@ public class CascadingBoolean extends EBoolean{ } return this; } - - public CascadingBoolean andAny(EBoolean... args) { + + public CascadingBoolean andAnyOf(EBoolean... args) { if (args.length > 0){ EBoolean any = args[0]; for (int i = 1; i < args.length; i++){ @@ -57,7 +57,7 @@ public class CascadingBoolean extends EBoolean{ return this; } - public CascadingBoolean orAll(EBoolean... args) { + public CascadingBoolean orAllOf(EBoolean... args) { if (args.length > 0){ EBoolean all = args[0]; for (int i = 1; i < args.length; i++){ diff --git a/querydsl-core/src/test/java/com/mysema/query/CascadingBooleanTest.java b/querydsl-core/src/test/java/com/mysema/query/CascadingBooleanTest.java index 173eaf65e..092db2cb4 100644 --- a/querydsl-core/src/test/java/com/mysema/query/CascadingBooleanTest.java +++ b/querydsl-core/src/test/java/com/mysema/query/CascadingBooleanTest.java @@ -7,7 +7,6 @@ package com.mysema.query; import org.junit.Test; -import com.mysema.query.alias.Alias; import com.mysema.query.types.expr.EBoolean; @@ -19,10 +18,20 @@ import com.mysema.query.types.expr.EBoolean; */ public class CascadingBooleanTest { + private EBoolean first = EBoolean.TRUE; + + private EBoolean second = EBoolean.FALSE; + @Test public void test(){ - EBoolean etrue = Alias.$(true); - EBoolean efalse = Alias.$(false); - new CascadingBoolean().and(etrue).or(efalse); + new CascadingBoolean().and(first).or(second); + } + + @Test + public void advanced(){ + CascadingBoolean builder = new CascadingBoolean(); + builder.andAnyOf(first, second, first); + builder.orAllOf(first, second, first); + System.out.println(builder); } }