From 4c4da2ce679efc0d53b7e62fa26d43c164cae7d4 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 12 Jun 2014 11:36:57 +0200 Subject: Combine various Lookup.search methods into a general search(Path, Property...) --- src/main/java/com/c2kernel/lookup/Lookup.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/main/java/com/c2kernel/lookup') diff --git a/src/main/java/com/c2kernel/lookup/Lookup.java b/src/main/java/com/c2kernel/lookup/Lookup.java index d71034f..1c7c6c7 100644 --- a/src/main/java/com/c2kernel/lookup/Lookup.java +++ b/src/main/java/com/c2kernel/lookup/Lookup.java @@ -7,6 +7,7 @@ import com.c2kernel.common.ObjectAlreadyExistsException; import com.c2kernel.common.ObjectCannotBeUpdated; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.process.auth.Authenticator; +import com.c2kernel.property.Property; import com.c2kernel.property.PropertyDescriptionList; /** @@ -115,7 +116,7 @@ public interface Lookup { * @param propvalue The property value to search for * @return An Iterator of matching Paths */ - public Iterator search(Path start, String propname, String propvalue); + public Iterator search(Path start, Property... props); /** * Search for Items of a particular type, based on its PropertyDescription outcome @@ -124,22 +125,6 @@ public interface Lookup { * @return An Iterator of matching Paths */ public Iterator search(Path start, PropertyDescriptionList props); - - /** - * Find all ItemPaths in a given subtree of the directory. - * - * @param start Search root - * @return An Iterator of matching Paths - */ - public Iterator searchEntities(Path start); - - /** - * Find all DomainPaths in a given subtree of the directory - * - * @param start Search root - * @return An Iterator of matching Paths - */ - public Iterator searchAliases(DomainPath start); /** * Find all DomainPaths that are aliases for a particular Item or Agent -- cgit v1.2.3