From ed2b0180f8fa480a84378c3ad5a82da6539be002 Mon Sep 17 00:00:00 2001 From: Ulrik Sandberg Date: Sun, 17 Oct 2010 21:29:36 +0000 Subject: [PATCH] Fixed LDAP-213, Javadoc for PresentFilter and NotPresentFilter is incorrect --- .../org/springframework/ldap/filter/HardcodedFilter.java | 2 +- .../java/org/springframework/ldap/filter/NotFilter.java | 1 - .../org/springframework/ldap/filter/NotPresentFilter.java | 2 +- .../java/org/springframework/ldap/filter/OrFilter.java | 8 ++++---- .../org/springframework/ldap/filter/PresentFilter.java | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java index bad4f304..da6f6f13 100644 --- a/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/HardcodedFilter.java @@ -20,7 +20,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.springframework.util.StringUtils; /** - * Allows hardcoded parts to be included in a search filter. Particularly useful + * Allows hard coded parts to be included in a search filter. Particularly useful * if some filters are specified in configuration files and these should be * combined with other ones. * diff --git a/core/src/main/java/org/springframework/ldap/filter/NotFilter.java b/core/src/main/java/org/springframework/ldap/filter/NotFilter.java index c0fa3ff0..6a46df7c 100644 --- a/core/src/main/java/org/springframework/ldap/filter/NotFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/NotFilter.java @@ -18,7 +18,6 @@ package org.springframework.ldap.filter; import org.apache.commons.lang.Validate; import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * A filter for 'not'. The following code: diff --git a/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java b/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java index fe4cad40..573e8b77 100644 --- a/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/NotPresentFilter.java @@ -26,7 +26,7 @@ import org.springframework.ldap.filter.AbstractFilter; * filter on attributes at are {@code present} use the {@link PresentFilter}. * *
- * NotPresentFilter filter = new NotPresentFilter("foo*");
+ * NotPresentFilter filter = new NotPresentFilter("foo");
  * System.out.println(filter.encode());
  * 
* diff --git a/core/src/main/java/org/springframework/ldap/filter/OrFilter.java b/core/src/main/java/org/springframework/ldap/filter/OrFilter.java index f1bbb36e..fec41d2c 100644 --- a/core/src/main/java/org/springframework/ldap/filter/OrFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/OrFilter.java @@ -20,10 +20,10 @@ package org.springframework.ldap.filter; * Filter for logical OR. * *
- *        OrFilter filter = new OrFilter();
- *        filter.or(new EqualsFilter("objectclass", "person");
- *        filter.or(new EqualsFilter("objectclass", "organizationalUnit");
- *        System.out.println(filter.encode());    
+ * OrFilter filter = new OrFilter();
+ * filter.or(new EqualsFilter("objectclass", "person");
+ * filter.or(new EqualsFilter("objectclass", "organizationalUnit");
+ * System.out.println(filter.encode());    
  * 
* * would result in: diff --git a/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java b/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java index a15d4d08..e860bb3d 100644 --- a/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java +++ b/core/src/main/java/org/springframework/ldap/filter/PresentFilter.java @@ -26,7 +26,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; * in combination with a {@link NotFilter} . * *
- * PresentFilter filter = new PresentFilter("foo*");
+ * PresentFilter filter = new PresentFilter("foo");
  * System.out.println(filter.encode());
  * 
*