From c2558a37527bd1035c7fbf2f5f182a2b844b51af Mon Sep 17 00:00:00 2001 From: Mattias Arthursson Date: Wed, 20 Aug 2008 17:25:00 +0000 Subject: [PATCH] Added common append method in BinaryLogicalFilter. --- .../springframework/ldap/filter/AndFilter.java | 2 +- .../ldap/filter/BinaryLogicalFilter.java | 15 ++++++++++++++- .../org/springframework/ldap/filter/OrFilter.java | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/AndFilter.java b/mvn-build/core/src/main/java/org/springframework/ldap/filter/AndFilter.java index 5ac556c1..4317a945 100644 --- a/mvn-build/core/src/main/java/org/springframework/ldap/filter/AndFilter.java +++ b/mvn-build/core/src/main/java/org/springframework/ldap/filter/AndFilter.java @@ -51,7 +51,7 @@ public class AndFilter extends BinaryLogicalFilter { * @return This LdapAndQuery */ public AndFilter and(Filter query) { - queryList.add(query); + append(query); return this; } } diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java b/mvn-build/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java index 7b10f706..bb7d745d 100644 --- a/mvn-build/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java +++ b/mvn-build/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java @@ -34,7 +34,9 @@ public abstract class BinaryLogicalFilter extends AbstractFilter { protected List queryList = new LinkedList(); /* - * @see org.springframework.ldap.filter.AbstractFilter#encode(java.lang.StringBuffer) + * @see + * org.springframework.ldap.filter.AbstractFilter#encode(java.lang.StringBuffer + * ) */ public StringBuffer encode(StringBuffer buff) { if (queryList.size() <= 0) { @@ -94,4 +96,15 @@ public abstract class BinaryLogicalFilter extends AbstractFilter { public int hashCode() { return HashCodeBuilder.reflectionHashCode(this); } + + /** + * Add a query to this logical operation. + * + * @param query the query to add. + * @return This instance. + */ + public final BinaryLogicalFilter append(Filter query) { + queryList.add(query); + return this; + } } diff --git a/mvn-build/core/src/main/java/org/springframework/ldap/filter/OrFilter.java b/mvn-build/core/src/main/java/org/springframework/ldap/filter/OrFilter.java index 85d9ae6b..6fa0dfeb 100644 --- a/mvn-build/core/src/main/java/org/springframework/ldap/filter/OrFilter.java +++ b/mvn-build/core/src/main/java/org/springframework/ldap/filter/OrFilter.java @@ -43,7 +43,7 @@ public class OrFilter extends BinaryLogicalFilter { * @return This LdapOrQuery */ public OrFilter or(Filter query) { - queryList.add(query); + append(query); return this; }