You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by lu...@apache.org on 2015/01/30 14:06:47 UTC
svn commit: r1656003 - in /directory/shared/trunk/ldap/client/api/src:
main/java/org/apache/directory/ldap/client/api/search/FilterBuilder.java
test/java/org/apache/directory/ldap/client/api/search/FilterBuilderTest.java
Author: lucastheisen
Date: Fri Jan 30 13:06:46 2015
New Revision: 1656003
URL: http://svn.apache.org/r1656003
Log:
DIRAPI-165: removed unnecessary custom method on filterbuilder
Modified:
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/search/FilterBuilder.java
directory/shared/trunk/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/search/FilterBuilderTest.java
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/search/FilterBuilder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/search/FilterBuilder.java?rev=1656003&r1=1656002&r2=1656003&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/search/FilterBuilder.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/search/FilterBuilder.java Fri Jan 30 13:06:46 2015
@@ -143,50 +143,6 @@ public class FilterBuilder
/**
- * An extension point for building filters. To use this feature, create a
- * new class that extends {@link Filter} and supply it to this method.
- *
- * For example, create your class:
- * <pre>
- * package your.package.here;
- * ...
- * public class EverythingFilter implements Filter {
- * private EverythingFilter() {}
- *
- * public static Filter everything()
- * {
- * return new EverythingFilter();
- * }
- *
- * public StringBuilder build()
- * {
- * return build( new StringBuilder() );
- * }
- *
- * public StringBuilder build( StringBuilder builder )
- * {
- * return "(objectClass=*)"
- * }
- * }
- * </pre>
- * Then use it:
- * <pre>
- * import static org.apache.directory.ldap.client.api.search.FilterBuilder.extended;
- * import static your.package.here.EverythingFilter.everything;
- * ...
- * custom( everything() );
- * </pre>
- *
- * @param filter The filter for an extension
- * @return A new FilterBuilder
- */
- public static FilterBuilder custom( Filter filter )
- {
- return new FilterBuilder( filter );
- }
-
-
- /**
* Creates an extensible match filter by calling
* {@link #extensible(String, String) extensible(null, value)}.
*
Modified: directory/shared/trunk/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/search/FilterBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/search/FilterBuilderTest.java?rev=1656003&r1=1656002&r2=1656003&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/search/FilterBuilderTest.java (original)
+++ directory/shared/trunk/ldap/client/api/src/test/java/org/apache/directory/ldap/client/api/search/FilterBuilderTest.java Fri Jan 30 13:06:46 2015
@@ -24,14 +24,11 @@ import static org.apache.directory.ldap.
import static org.apache.directory.ldap.client.api.search.FilterBuilder.contains;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.endsWith;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.equal;
-import static org.apache.directory.ldap.client.api.search.FilterBuilder.custom;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.extensible;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.not;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.or;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.startsWith;
import static org.apache.directory.ldap.client.api.search.FilterBuilder.substring;
-import static org.apache.directory.ldap.client.api.search.FilterBuilderTest.EverythingFilter.everything;
-import static org.apache.directory.ldap.client.api.search.FilterBuilderTest.MuppetFilter.muppet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -46,6 +43,14 @@ import org.junit.Test;
public class FilterBuilderTest
{
@Test
+ public void testExtensible()
+ {
+ assertEquals( "(cn:caseExactMatch:=Fred Flintstone)",
+ extensible( "cn", "Fred Flintstone" )
+ .setMatchingRule( "caseExactMatch" ).toString() );
+ }
+
+ @Test
public void testFilterBuilder()
{
assertEquals( "(cn=Babs Jensen)", equal( "cn", "Babs Jensen" ).toString() );
@@ -139,78 +144,4 @@ public class FilterBuilderTest
assertEquals( "(o=the*igan)", substring( "o", "the", "igan" ).toString() );
assertEquals( "(o=the*sit*of*igan)", substring( "o", "the", "sit", "of", "igan" ).toString() );
}
-
-
- @Test
- public void testCustom()
- {
- assertEquals( "(objectClass=*)", custom( everything() ).toString() );
- assertEquals( "(&(objectClass=inetOrgPerson)(departmentNumber=muppets))",
- custom( muppet() ).toString() );
- }
-
-
- @Test
- public void testExtensible()
- {
- assertEquals( "(cn:caseExactMatch:=Fred Flintstone)",
- extensible( "cn", "Fred Flintstone" )
- .setMatchingRule( "caseExactMatch" ).toString() );
- }
-
-
- public static class EverythingFilter implements Filter
- {
- private EverythingFilter()
- {
- }
-
-
- public static Filter everything()
- {
- return new EverythingFilter();
- }
-
-
- public StringBuilder build()
- {
- return build( new StringBuilder() );
- }
-
-
- public StringBuilder build( StringBuilder builder )
- {
- return new StringBuilder( "(objectClass=*)" );
- }
- }
-
-
- public static class MuppetFilter implements Filter
- {
- private static final String filter = and(
- equal( "objectClass", "inetOrgPerson" ),
- equal( "departmentNumber", "muppets" ) ).toString();
-
- private MuppetFilter()
- {
- }
-
-
- public static Filter muppet()
- {
- return new MuppetFilter();
- }
-
-
- public StringBuilder build()
- {
- return build( new StringBuilder() );
- }
-
-
- public StringBuilder build( StringBuilder builder )
- {
- return builder.append( filter );
- }
- }
}