Author: bdaw Date: 2009-03-23 15:50:51 -0400 (Mon, 23 Mar 2009) New Revision: 400 Added: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteriumType.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedCriterium.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryCriterium.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchCriteria.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchCriteriaType.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchCriteriaImpl.java Removed: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraintType.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraints.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedConstraint.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryConstraint.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchConstraints.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchConstraintType.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchConstraintsImpl.java Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityStore.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java Log: Update naming to more proper Deleted: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchConstraintsImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchConstraintsImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchConstraintsImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,242 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import org.jboss.identity.idm.api.IdentitySearchConstraints; -import org.jboss.identity.idm.api.SortOrder; -import org.jboss.identity.idm.api.UnsupportedConstraint; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; - -import java.util.Map; -import java.util.HashMap; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class IdentitySearchConstraintsImpl implements IdentitySearchConstraints, IdentityObjectSearchConstraints -{ - - private boolean sorted = false; - - private String sortByName; - - private boolean ascending = true; - - private boolean paged = false; - - private int firstResult; - - private int maxResults; - - private boolean filtered = false; - - private final Map<String, String[]> attributes = new HashMap<String, String[]>(); - - private String filter; - - public IdentitySearchConstraintsImpl() - { - - } - - public IdentitySearchConstraints sort(SortOrder order) throws UnsupportedConstraint - { - sorted = true; - if (order.equals(SortOrder.ASCENDING)) - { - ascending = true; - } - else - { - ascending = false; - } - - return this; - } - - public IdentitySearchConstraints sortAttributeName(String name) throws UnsupportedConstraint - { - sorted = true; - sortByName = name; - - return this; - } - - public IdentitySearchConstraints page(int firstResult, int maxResults) throws UnsupportedConstraint - { - paged = true; - - this.firstResult = firstResult; - this.maxResults = maxResults; - - - return this; - } - - public IdentitySearchConstraints attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedConstraint - { - if (attributeName == null) - { - throw new IllegalArgumentException("Attribute name is null"); - } - - if (attributeValue == null) - { - throw new IllegalArgumentException("Attribute values are null"); - - } - - filtered = true; - - attributes.put(attributeName, attributeValue); - - return this; - } - - public IdentitySearchConstraints idFilter(String filter) throws UnsupportedConstraint - { - if (filter == null) - { - throw new IllegalArgumentException("ID filter is null"); - } - - this.filter = filter; - - return this; - } - - public String getFilter() - { - return filter; - } - - public boolean isSorted() - { - return sorted; - } - - public boolean isAscending() - { - return ascending; - } - - public String getSortAttributeName() - { - return sortByName; - } - - public boolean isPaged() - { - return paged; - } - - public int getFirstResult() - { - return firstResult; - } - - public int getMaxResults() - { - return maxResults; - } - - public boolean isFiltered() - { - return filtered; - } - - public Map<String, String[]> getValues() - { - return attributes; - } - - @Override - public boolean equals(Object o) - { - if (this == o) - { - return true; - } - if (o == null || getClass() != o.getClass()) - { - return false; - } - - IdentitySearchConstraintsImpl that = (IdentitySearchConstraintsImpl)o; - - if (ascending != that.ascending) - { - return false; - } - if (filtered != that.filtered) - { - return false; - } - if (firstResult != that.firstResult) - { - return false; - } - if (maxResults != that.maxResults) - { - return false; - } - if (paged != that.paged) - { - return false; - } - if (sorted != that.sorted) - { - return false; - } - if (!attributes.equals(that.attributes)) - { - return false; - } - if (filter != null ? !filter.equals(that.filter) : that.filter != null) - { - return false; - } - if (sortByName != null ? !sortByName.equals(that.sortByName) : that.sortByName != null) - { - return false; - } - - return true; - } - - @Override - public int hashCode() - { - int result = (sorted ? 1 : 0); - result = 31 * result + (sortByName != null ? sortByName.hashCode() : 0); - result = 31 * result + (ascending ? 1 : 0); - result = 31 * result + (paged ? 1 : 0); - result = 31 * result + firstResult; - result = 31 * result + maxResults; - result = 31 * result + (filtered ? 1 : 0); - result = 31 * result + attributes.hashCode(); - result = 31 * result + (filter != null ? filter.hashCode() : 0); - return result; - } -} Copied: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchCriteriaImpl.java (from rev 398, idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchConstraintsImpl.java) =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchCriteriaImpl.java (rev 0) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/IdentitySearchCriteriaImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,242 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import org.jboss.identity.idm.api.IdentitySearchCriteria; +import org.jboss.identity.idm.api.SortOrder; +import org.jboss.identity.idm.api.UnsupportedCriterium; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; + +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class IdentitySearchCriteriaImpl implements IdentitySearchCriteria, IdentityObjectSearchCriteria +{ + + private boolean sorted = false; + + private String sortByName; + + private boolean ascending = true; + + private boolean paged = false; + + private int firstResult; + + private int maxResults; + + private boolean filtered = false; + + private final Map<String, String[]> attributes = new HashMap<String, String[]>(); + + private String filter; + + public IdentitySearchCriteriaImpl() + { + + } + + public IdentitySearchCriteria sort(SortOrder order) throws UnsupportedCriterium + { + sorted = true; + if (order.equals(SortOrder.ASCENDING)) + { + ascending = true; + } + else + { + ascending = false; + } + + return this; + } + + public IdentitySearchCriteria sortAttributeName(String name) throws UnsupportedCriterium + { + sorted = true; + sortByName = name; + + return this; + } + + public IdentitySearchCriteria page(int firstResult, int maxResults) throws UnsupportedCriterium + { + paged = true; + + this.firstResult = firstResult; + this.maxResults = maxResults; + + + return this; + } + + public IdentitySearchCriteria attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedCriterium + { + if (attributeName == null) + { + throw new IllegalArgumentException("Attribute name is null"); + } + + if (attributeValue == null) + { + throw new IllegalArgumentException("Attribute values are null"); + + } + + filtered = true; + + attributes.put(attributeName, attributeValue); + + return this; + } + + public IdentitySearchCriteria idFilter(String filter) throws UnsupportedCriterium + { + if (filter == null) + { + throw new IllegalArgumentException("ID filter is null"); + } + + this.filter = filter; + + return this; + } + + public String getFilter() + { + return filter; + } + + public boolean isSorted() + { + return sorted; + } + + public boolean isAscending() + { + return ascending; + } + + public String getSortAttributeName() + { + return sortByName; + } + + public boolean isPaged() + { + return paged; + } + + public int getFirstResult() + { + return firstResult; + } + + public int getMaxResults() + { + return maxResults; + } + + public boolean isFiltered() + { + return filtered; + } + + public Map<String, String[]> getValues() + { + return attributes; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + IdentitySearchCriteriaImpl that = (IdentitySearchCriteriaImpl)o; + + if (ascending != that.ascending) + { + return false; + } + if (filtered != that.filtered) + { + return false; + } + if (firstResult != that.firstResult) + { + return false; + } + if (maxResults != that.maxResults) + { + return false; + } + if (paged != that.paged) + { + return false; + } + if (sorted != that.sorted) + { + return false; + } + if (!attributes.equals(that.attributes)) + { + return false; + } + if (filter != null ? !filter.equals(that.filter) : that.filter != null) + { + return false; + } + if (sortByName != null ? !sortByName.equals(that.sortByName) : that.sortByName != null) + { + return false; + } + + return true; + } + + @Override + public int hashCode() + { + int result = (sorted ? 1 : 0); + result = 31 * result + (sortByName != null ? sortByName.hashCode() : 0); + result = 31 * result + (ascending ? 1 : 0); + result = 31 * result + (paged ? 1 : 0); + result = 31 * result + firstResult; + result = 31 * result + maxResults; + result = 31 * result + (filtered ? 1 : 0); + result = 31 * result + attributes.hashCode(); + result = 31 * result + (filter != null ? filter.hashCode() : 0); + return result; + } +} Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/AbstractManager.java 2009-03-23 19:50:51 UTC (rev 400) @@ -27,13 +27,13 @@ import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.IdentityType; import org.jboss.identity.idm.api.Attribute; -import org.jboss.identity.idm.api.IdentitySearchConstraints; +import org.jboss.identity.idm.api.IdentitySearchCriteria; import org.jboss.identity.idm.spi.repository.IdentityStoreRepository; import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.model.IdentityObjectType; import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; import org.jboss.identity.idm.impl.types.SimpleIdentityObject; import org.jboss.identity.idm.impl.api.session.context.IdentitySessionContext; import org.jboss.identity.idm.impl.api.session.IdentitySessionImpl; @@ -41,12 +41,8 @@ import org.jboss.identity.idm.impl.api.model.SimpleGroup; import org.jboss.identity.idm.impl.api.model.GroupId; import org.jboss.identity.idm.impl.api.SimpleAttribute; -import org.jboss.identity.idm.impl.api.IdentitySearchConstraintsImpl; -import org.jboss.identity.idm.exception.IdentityException; +import org.jboss.identity.idm.impl.api.IdentitySearchCriteriaImpl; -import java.util.List; -import java.util.LinkedList; - /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ @@ -65,9 +61,9 @@ return identitySession; } - public IdentitySearchConstraints createIdentitySearchConstraints() + public IdentitySearchCriteria createIdentitySearchConstraints() { - return new IdentitySearchConstraintsImpl(); + return new IdentitySearchCriteriaImpl(); } protected IdentitySessionContext getSessionContext() @@ -183,16 +179,16 @@ return new SimpleGroup(new GroupId(id)); } - protected IdentityObjectSearchConstraints convertSearchControls(IdentitySearchConstraints controls) + protected IdentityObjectSearchCriteria convertSearchControls(IdentitySearchCriteria controls) { if (controls == null) { return null; } - if (controls instanceof IdentityObjectSearchConstraints) + if (controls instanceof IdentityObjectSearchCriteria) { - return (IdentityObjectSearchConstraints)controls; + return (IdentityObjectSearchCriteria)controls; } else { Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/PersistenceManagerImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -27,12 +27,12 @@ import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.IdentitySession; import org.jboss.identity.idm.api.PersistenceManagerFeaturesDescription; -import org.jboss.identity.idm.api.IdentitySearchConstraints; -import org.jboss.identity.idm.api.IdentitySearchConstraintType; +import org.jboss.identity.idm.api.IdentitySearchCriteria; +import org.jboss.identity.idm.api.IdentitySearchCriteriumType; import org.jboss.identity.idm.exception.IdentityException; import org.jboss.identity.idm.spi.model.IdentityObjectType; import org.jboss.identity.idm.spi.model.IdentityObject; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; import org.jboss.identity.idm.impl.api.session.managers.AbstractManager; import org.jboss.identity.idm.impl.api.model.GroupId; @@ -73,33 +73,33 @@ isIdentityObjectAddRemoveSupported(objectType); } - public boolean isUsersSearchConstraintTypeSupported(IdentitySearchConstraintType constraintType) + public boolean isUsersSearchCriteriumTypeSupported(IdentitySearchCriteriumType constraintType) { IdentityObjectType objectType = getSessionContext().getIdentityObjectTypeMapper().getIdentityObjectType(); - IdentityObjectSearchConstraintType constraint = IdentityObjectSearchConstraintType.valueOf(constraintType.name()); + IdentityObjectSearchCriteriaType constraint = IdentityObjectSearchCriteriaType.valueOf(constraintType.name()); if (constraint != null) { return getSessionContext().getIdentityStoreRepository().getSupportedFeatures(). - isSearchConstraintTypeSupported(objectType, constraint); + isSearchCriteriaTypeSupported(objectType, constraint); } return false; } - public boolean isGroupsSearchConstraintTypeSupported(String groupType, IdentitySearchConstraintType constraintType) + public boolean isGroupsSearchCriteriumTypeSupported(String groupType, IdentitySearchCriteriumType constraintType) { IdentityObjectType objectType = getSessionContext().getIdentityObjectTypeMapper().getIdentityObjectType(groupType); - IdentityObjectSearchConstraintType constraint = IdentityObjectSearchConstraintType.valueOf(constraintType.name()); + IdentityObjectSearchCriteriaType constraint = IdentityObjectSearchCriteriaType.valueOf(constraintType.name()); if (constraint != null) { return getSessionContext().getIdentityStoreRepository().getSupportedFeatures(). - isSearchConstraintTypeSupported(objectType, constraint); + isSearchCriteriaTypeSupported(objectType, constraint); } return false; @@ -202,7 +202,7 @@ return createUser(getRepository().findIdentityObject(getInvocationContext(), name, getUserObjectType())); } - public Collection<User> findUser(IdentitySearchConstraints controls) throws IdentityException + public Collection<User> findUser(IdentitySearchCriteria controls) throws IdentityException { @@ -232,7 +232,7 @@ return createGroup(getRepository().findIdentityObject(getInvocationContext(), id)); } - public Collection<Group> findGroup(String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findGroup(String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(groupType, "Group type"); @@ -252,7 +252,7 @@ { checkNotNullArgument(groupType, "Group type"); - return findGroup(groupType, (IdentitySearchConstraints) null); + return findGroup(groupType, (IdentitySearchCriteria) null); } // public boolean isVirtual(User identity) Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RelationshipManagerImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -28,14 +28,14 @@ import org.jboss.identity.idm.api.User; import org.jboss.identity.idm.api.IdentityType; import org.jboss.identity.idm.api.RelationshipManagerFeaturesDescription; -import org.jboss.identity.idm.api.IdentitySearchConstraints; -import org.jboss.identity.idm.api.IdentitySearchConstraintType; +import org.jboss.identity.idm.api.IdentitySearchCriteria; +import org.jboss.identity.idm.api.IdentitySearchCriteriumType; import org.jboss.identity.idm.exception.IdentityException; import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.idm.spi.model.IdentityObjectRelationship; import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.model.IdentityObjectType; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; import org.jboss.identity.idm.impl.NotYetImplementedException; import org.jboss.identity.idm.impl.api.session.managers.AbstractManager; @@ -103,32 +103,32 @@ } } - public boolean isIdentitiesSearchConstraintTypeSupported(IdentitySearchConstraintType constraintType) + public boolean isIdentitiesSearchCriteriumTypeSupported(IdentitySearchCriteriumType constraintType) { IdentityObjectType objectType = getSessionContext().getIdentityObjectTypeMapper().getIdentityObjectType(); - IdentityObjectSearchConstraintType constraint = IdentityObjectSearchConstraintType.valueOf(constraintType.name()); + IdentityObjectSearchCriteriaType constraint = IdentityObjectSearchCriteriaType.valueOf(constraintType.name()); if (constraint != null) { return getSessionContext().getIdentityStoreRepository().getSupportedFeatures(). - isSearchConstraintTypeSupported(objectType, constraint); + isSearchCriteriaTypeSupported(objectType, constraint); } return false; } - public boolean isGroupsSearchConstraintTypeSupported(String groupType, IdentitySearchConstraintType constraintType) + public boolean isGroupsSearchCriteriumTypeSupported(String groupType, IdentitySearchCriteriumType constraintType) { IdentityObjectType objectType = getSessionContext().getIdentityObjectTypeMapper().getIdentityObjectType(groupType); - IdentityObjectSearchConstraintType constraint = IdentityObjectSearchConstraintType.valueOf(constraintType.name()); + IdentityObjectSearchCriteriaType constraint = IdentityObjectSearchCriteriaType.valueOf(constraintType.name()); if (constraint != null) { return getSessionContext().getIdentityStoreRepository().getSupportedFeatures(). - isSearchConstraintTypeSupported(objectType, constraint); + isSearchCriteriaTypeSupported(objectType, constraint); } return false; @@ -467,7 +467,7 @@ return true; } - public Collection<Group> findAssociatedGroups(Group group, String groupType, boolean parent, boolean inherited, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findAssociatedGroups(Group group, String groupType, boolean parent, boolean inherited, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(group, "Group"); @@ -497,7 +497,7 @@ } - public Collection<Group> findAssociatedGroups(String groupId, String groupType, boolean parent, boolean inherited, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findAssociatedGroups(String groupId, String groupType, boolean parent, boolean inherited, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(groupId, "Group Id"); // checkNotNullArgument(groupType, "Group type"); @@ -515,7 +515,7 @@ return findAssociatedGroups(group, groupType, parent, inherited, null); } - public Collection<Group> findAssociatedGroups(User identity, String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findAssociatedGroups(User identity, String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(identity, "User"); //checkNotNullArgument(groupType, "Group type"); @@ -537,7 +537,7 @@ return identities; } - public Collection<Group> findAssociatedGroups(String userName, String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findAssociatedGroups(String userName, String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); //checkNotNullArgument(groupType, "Group type"); @@ -555,7 +555,7 @@ return findAssociatedGroups(identity, groupType, null); } - public Collection<Group> findAssociatedGroups(User identity, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findAssociatedGroups(User identity, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(identity, "User"); @@ -577,7 +577,7 @@ return identities; } - public Collection<Group> findAssociatedGroups(String userName, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findAssociatedGroups(String userName, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); @@ -590,10 +590,10 @@ { checkNotNullArgument(identity, "User"); - return findAssociatedGroups(identity, (IdentitySearchConstraints)null); + return findAssociatedGroups(identity, (IdentitySearchCriteria)null); } - public Collection<User> findAssociatedUsers(Group group, boolean inherited, IdentitySearchConstraints controls) throws IdentityException + public Collection<User> findAssociatedUsers(Group group, boolean inherited, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(group, "Group"); @@ -621,7 +621,7 @@ return identities; } - public Collection<User> findAssociatedUsers(String groupId, boolean inherited, IdentitySearchConstraints controls) throws IdentityException + public Collection<User> findAssociatedUsers(String groupId, boolean inherited, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(groupId, "Group Id"); @@ -637,7 +637,7 @@ return findAssociatedUsers(group, inherited, null); } - public Collection<Group> findRelatedGroups(User user, String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findRelatedGroups(User user, String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(user, "User"); @@ -658,7 +658,7 @@ return identities; } - public Collection<Group> findRelatedGroups(String userName, String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findRelatedGroups(String userName, String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); @@ -667,7 +667,7 @@ return findRelatedGroups(user, groupType, controls); } - public Collection<User> findRelatedUsers(Group group, IdentitySearchConstraints controls) throws IdentityException + public Collection<User> findRelatedUsers(Group group, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(group, "Group"); @@ -693,7 +693,7 @@ return identities; } - public Collection<User> findRelatedUsers(String groupId, IdentitySearchConstraints controls) throws IdentityException + public Collection<User> findRelatedUsers(String groupId, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(groupId, "Group Id"); Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/api/session/managers/RoleManagerImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -30,15 +30,15 @@ import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.IdentityType; import org.jboss.identity.idm.api.RoleManagerFeaturesDescription; -import org.jboss.identity.idm.api.IdentitySearchConstraints; -import org.jboss.identity.idm.api.IdentitySearchConstraintType; +import org.jboss.identity.idm.api.IdentitySearchCriteria; +import org.jboss.identity.idm.api.IdentitySearchCriteriumType; import org.jboss.identity.idm.exception.IdentityException; import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.idm.spi.model.IdentityObjectRelationship; import org.jboss.identity.idm.spi.model.IdentityObjectType; import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.exception.OperationNotSupportedException; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; import org.jboss.identity.idm.impl.api.model.SimpleRoleType; import org.jboss.identity.idm.impl.api.model.SimpleRole; @@ -75,14 +75,14 @@ return getSessionContext().getIdentityStoreRepository().getSupportedFeatures().isRelationshipNameAddRemoveSupported(); } - public boolean isRoleTypeSearchConstraintTypeSupported(IdentitySearchConstraintType constraintType) + public boolean isRoleTypeSearchCriteriumTypeSupported(IdentitySearchCriteriumType constraintType) { - IdentityObjectSearchConstraintType constraint = IdentityObjectSearchConstraintType.valueOf(constraintType.name()); + IdentityObjectSearchCriteriaType constraint = IdentityObjectSearchCriteriaType.valueOf(constraintType.name()); if (constraint != null) { return getSessionContext().getIdentityStoreRepository().getSupportedFeatures(). - isRoleNameSearchConstraintSupported(constraint); + isRoleNameSearchCriteriaTypeSupported(constraint); } else { @@ -157,7 +157,7 @@ return null; } - public Collection<RoleType> findRoleTypes(IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findRoleTypes(IdentitySearchCriteria controls) throws IdentityException { @@ -277,7 +277,7 @@ return findRoleTypes(identity, group, null); } - public Collection<RoleType> findRoleTypes(User identity, Group group, IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findRoleTypes(User identity, Group group, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(identity, "User"); checkNotNullArgument(group, "Group"); @@ -295,7 +295,7 @@ } - public Collection<RoleType> findRoleTypes(String userName, String groupId, IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findRoleTypes(String userName, String groupId, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); checkNotNullArgument(groupId, "Group Id"); @@ -313,7 +313,7 @@ return findUserRoleTypes(identity, null); } - public Collection<RoleType> findUserRoleTypes(User identity, IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findUserRoleTypes(User identity, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(identity, "User"); @@ -338,7 +338,7 @@ } - public Collection<RoleType> findUserRoleTypes(String userName, IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findUserRoleTypes(String userName, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); @@ -354,7 +354,7 @@ return findGroupRoleTypes(group, null); } - public Collection<RoleType> findGroupRoleTypes(String groupId, IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findGroupRoleTypes(String groupId, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(groupId, "Group Id"); @@ -363,7 +363,7 @@ return findGroupRoleTypes(group, controls); } - public Collection<RoleType> findGroupRoleTypes(Group group, IdentitySearchConstraints controls) throws IdentityException + public Collection<RoleType> findGroupRoleTypes(Group group, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(group, "Group"); @@ -388,7 +388,7 @@ } - public Collection<Group> findGroupsWithRelatedRole(User identity, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findGroupsWithRelatedRole(User identity, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(identity, "User"); @@ -408,7 +408,7 @@ return identities; } - public Collection<Group> findGroupsWithRelatedRole(String userName, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findGroupsWithRelatedRole(String userName, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); @@ -417,7 +417,7 @@ return findGroupsWithRelatedRole(user, controls); } - public Collection<Group> findGroupsWithRelatedRole(User identity, String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findGroupsWithRelatedRole(User identity, String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(identity, "User"); checkNotNullArgument(groupType, "Group type"); @@ -441,7 +441,7 @@ return identities; } - public Collection<Group> findGroupsWithRelatedRole(String userName, String groupType, IdentitySearchConstraints controls) throws IdentityException + public Collection<Group> findGroupsWithRelatedRole(String userName, String groupType, IdentitySearchCriteria controls) throws IdentityException { checkNotNullArgument(userName, "User name"); checkNotNullArgument(groupType, "Group type"); Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/IdentityStoreCacheSupport.java 2009-03-23 19:50:51 UTC (rev 400) @@ -30,7 +30,7 @@ import org.jboss.identity.idm.spi.model.IdentityObjectType; import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.idm.spi.model.IdentityObjectRelationship; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; import java.util.logging.Logger; import java.util.logging.Level; @@ -456,7 +456,7 @@ } protected void putIdentityObjectSearchIntoCache(IdentityObjectType identityType, - IdentityObjectSearchConstraints controls, + IdentityObjectSearchCriteria controls, Collection<IdentityObject> results) { Fqn nodeFqn = createIOTypeSearchNodeFQN(identityType, getControlsHash(controls)); @@ -472,7 +472,7 @@ } protected Collection<IdentityObject> getIdentityObjectSearchFromCache(IdentityObjectType identityType, - IdentityObjectSearchConstraints controls) + IdentityObjectSearchCriteria controls) { Fqn nodeFqn = createIOTypeSearchNodeFQN(identityType, getControlsHash(controls)); @@ -499,7 +499,7 @@ protected void putIdentityObjectSearchToCache(IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints controls, + IdentityObjectSearchCriteria controls, Collection<IdentityObject> results) { @@ -521,7 +521,7 @@ protected Collection<IdentityObject> getIdentityObjectSearchFromCache(IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints controls) + IdentityObjectSearchCriteria controls) { Fqn nodeFqn = createIOSearchNodeFQN(identity, relationshipType, parent, getControlsHash(controls)); @@ -811,7 +811,7 @@ - protected void putRelationshipNamesSearchIntoCache(IdentityObjectSearchConstraints controls, Set<String> results) + protected void putRelationshipNamesSearchIntoCache(IdentityObjectSearchCriteria controls, Set<String> results) { Fqn fqn = createRelationshipNamesAllSearchFqn(getControlsHash(controls)); @@ -828,7 +828,7 @@ } - protected Set<String> getRelationshipNamesSearchFromCache(IdentityObjectSearchConstraints controls) + protected Set<String> getRelationshipNamesSearchFromCache(IdentityObjectSearchCriteria controls) { Fqn fqn = createRelationshipNamesAllSearchFqn(getControlsHash(controls)); @@ -853,7 +853,7 @@ } protected void putRelationshipNamesSearchIntoCache(IdentityObject identity, - IdentityObjectSearchConstraints controls, + IdentityObjectSearchCriteria controls, Set<String> results) { @@ -872,7 +872,7 @@ } - protected Set<String> getRelationshipNamesSearchFromCache(IdentityObject identity, IdentityObjectSearchConstraints controls) + protected Set<String> getRelationshipNamesSearchFromCache(IdentityObject identity, IdentityObjectSearchCriteria controls) { @@ -896,7 +896,7 @@ return null; } - private int getControlsHash(IdentityObjectSearchConstraints controls) + private int getControlsHash(IdentityObjectSearchCriteria controls) { // Convert controls to Set to have the same hashcode regardles order of controls int hashcode = 0; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/cache/JBossCacheIdentityStoreWrapper.java 2009-03-23 19:50:51 UTC (rev 400) @@ -32,7 +32,7 @@ import org.jboss.identity.idm.spi.model.IdentityObjectCredential; import org.jboss.identity.idm.spi.exception.OperationNotSupportedException; import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; import org.jboss.identity.idm.exception.IdentityException; import java.util.Map; @@ -190,7 +190,7 @@ public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, - IdentityObjectSearchConstraints controls) throws IdentityException + IdentityObjectSearchCriteria controls) throws IdentityException { Collection<IdentityObject> results = getIdentityObjectSearchFromCache(identityType, controls); @@ -220,7 +220,7 @@ IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints controls) throws IdentityException + IdentityObjectSearchCriteria controls) throws IdentityException { Collection<IdentityObject> results = getIdentityObjectSearchFromCache(identity, relationshipType, parent, controls); @@ -342,7 +342,7 @@ } public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, - IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { Set<String> results = getRelationshipNamesSearchFromCache(controls); @@ -359,7 +359,7 @@ public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, - IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/FallbackIdentityStoreRepository.java 2009-03-23 19:50:51 UTC (rev 400) @@ -27,7 +27,7 @@ import org.jboss.identity.idm.spi.store.FeaturesMetaData; import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; import org.jboss.identity.idm.spi.store.IdentityStoreSession; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.model.IdentityObjectType; import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; @@ -40,7 +40,7 @@ import org.jboss.identity.idm.spi.model.IdentityObjectCredential; import org.jboss.identity.idm.spi.model.IdentityObjectCredentialType; import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; import org.jboss.identity.idm.exception.IdentityException; import org.jboss.identity.idm.impl.store.SimpleIdentityStoreInvocationContext; import org.jboss.identity.idm.impl.api.session.managers.RoleManagerImpl; @@ -147,9 +147,9 @@ return defaultIdentityStore.getSupportedFeatures().isNamedRelationshipsSupported(); } - public boolean isSearchConstraintTypeSupported(IdentityObjectType identityObjectType, IdentityObjectSearchConstraintType storeSearchConstraint) + public boolean isSearchCriteriaTypeSupported(IdentityObjectType identityObjectType, IdentityObjectSearchCriteriaType storeSearchConstraint) { - return resolveIdentityStore(identityObjectType).getSupportedFeatures().isSearchConstraintTypeSupported(identityObjectType, storeSearchConstraint); + return resolveIdentityStore(identityObjectType).getSupportedFeatures().isSearchCriteriaTypeSupported(identityObjectType, storeSearchConstraint); } public Set<String> getSupportedIdentityObjectTypes() @@ -224,22 +224,22 @@ } - public boolean isRoleNameSearchConstraintSupported(IdentityObjectSearchConstraintType constraint) + public boolean isRoleNameSearchCriteriaTypeSupported(IdentityObjectSearchCriteriaType constraint) { // If there is any IdentityStore that supports named relationships... for (IdentityStore identityStore : getIdentityStoreMappings().values()) { if (identityStore.getSupportedFeatures().isNamedRelationshipsSupported() && - identityStore.getSupportedFeatures().isRoleNameSearchConstraintSupported(constraint)) + identityStore.getSupportedFeatures().isRoleNameSearchCriteriaTypeSupported(constraint)) { return true; } } return defaultIdentityStore.getSupportedFeatures().isNamedRelationshipsSupported() && - defaultIdentityStore.getSupportedFeatures().isRoleNameSearchConstraintSupported(constraint); + defaultIdentityStore.getSupportedFeatures().isRoleNameSearchCriteriaTypeSupported(constraint); } - }; + }; } @@ -390,7 +390,7 @@ return defaultIdentityStore.findIdentityObject(invocationContext, id); } - public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, IdentityObjectSearchConstraints controls) throws IdentityException + public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, IdentityObjectSearchCriteria controls) throws IdentityException { IdentityStore targetStore = resolveIdentityStore(identityType); IdentityStoreInvocationContext targetCtx = resolveInvocationContext(targetStore, invocationCtx); @@ -402,7 +402,7 @@ IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints constraints) throws IdentityException + IdentityObjectSearchCriteria constraints) throws IdentityException { // Check in the mapped store and merge with default @@ -650,7 +650,7 @@ return name; } - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { Set<String> results = new HashSet<String>(); @@ -668,7 +668,7 @@ return results; } - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { IdentityStore toStore = resolveIdentityStore(identity); @@ -999,7 +999,7 @@ } //TODO: other way - private List<IdentityObject> cutPageFromResults(List<IdentityObject> objects, IdentityObjectSearchConstraints constraints) + private List<IdentityObject> cutPageFromResults(List<IdentityObject> objects, IdentityObjectSearchCriteria constraints) { List<IdentityObject> results = new LinkedList<IdentityObject>(); for (int i = constraints.getFirstResult(); i < constraints.getFirstResult() + constraints.getMaxResults(); i++) Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/repository/WrapperIdentityStoreRepository.java 2009-03-23 19:50:51 UTC (rev 400) @@ -37,7 +37,7 @@ import org.jboss.identity.idm.spi.model.IdentityObjectCredential; import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; import org.jboss.identity.idm.spi.exception.OperationNotSupportedException; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; import org.jboss.identity.idm.exception.IdentityException; import org.jboss.identity.idm.impl.store.SimpleIdentityStoreInvocationContext; @@ -163,7 +163,7 @@ public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, - IdentityObjectSearchConstraints controls) throws IdentityException + IdentityObjectSearchCriteria controls) throws IdentityException { return defaultIdentityStore.findIdentityObject(resolveIdentityStoreInvocationContext(invocationCtx), identityType, controls); } @@ -172,7 +172,7 @@ IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints controls) throws IdentityException + IdentityObjectSearchCriteria controls) throws IdentityException { return defaultIdentityStore.findIdentityObject(resolveIdentityStoreInvocationContext(invocationCtx), identity, relationshipType, parent, controls); } @@ -237,14 +237,14 @@ } public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, - IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { return defaultIdentityStore.getRelationshipNames(resolveIdentityStoreInvocationContext(ctx), controls); } public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, - IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { return defaultIdentityStore.getRelationshipNames(resolveIdentityStoreInvocationContext(ctx), identity, controls); } Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/FeaturesMetaDataImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -36,7 +36,7 @@ import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.idm.spi.model.IdentityObjectType; import org.jboss.identity.idm.spi.store.FeaturesMetaData; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -46,7 +46,7 @@ { private Set<String> supportedTypeNames = new HashSet<String>(); - private final Set<IdentityObjectSearchConstraintType> supportedSearchConstraintTypes; + private final Set<IdentityObjectSearchCriteriaType> supportedSearchConstraintTypes; private final Map<String, Set<String>> supportedCredentials; @@ -59,7 +59,7 @@ public FeaturesMetaDataImpl(IdentityStoreConfigurationMetaData configurationMD, - Set<IdentityObjectSearchConstraintType> supportedControls, + Set<IdentityObjectSearchCriteriaType> supportedControls, boolean namedRelationshipsSupport, Set<String> readOnlyObjectTypes) { @@ -162,7 +162,7 @@ return namedRelationshipsSupport; } - public boolean isSearchConstraintTypeSupported(IdentityObjectType identityObjectType, IdentityObjectSearchConstraintType storeSearchConstraint) + public boolean isSearchCriteriaTypeSupported(IdentityObjectType identityObjectType, IdentityObjectSearchCriteriaType storeSearchConstraint) { if (supportedSearchConstraintTypes.contains(storeSearchConstraint)) { @@ -213,10 +213,10 @@ return false; } - public boolean isRoleNameSearchConstraintSupported(IdentityObjectSearchConstraintType constraint) + public boolean isRoleNameSearchCriteriaTypeSupported(IdentityObjectSearchCriteriaType constraint) { // For now simple - use the same allowed controls list for everything - return isNamedRelationshipsSupported() && isSearchConstraintTypeSupported(null, constraint); + return isNamedRelationshipsSupported() && isSearchCriteriaTypeSupported(null, constraint); } } Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -69,8 +69,8 @@ import org.jboss.identity.idm.spi.store.IdentityStore; import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; import org.jboss.identity.idm.spi.store.IdentityStoreSession; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; //import javax.persistence.Persistence; import javax.naming.InitialContext; @@ -138,8 +138,8 @@ // TODO: rewrite this into some more handy object private IdentityStoreConfigurationMetaData configurationMD; - private static Set<IdentityObjectSearchConstraintType> supportedIdentityObjectSearchControls = - new HashSet<IdentityObjectSearchConstraintType>(); + private static Set<IdentityObjectSearchCriteriaType> supportedIdentityObjectSearchControls = + new HashSet<IdentityObjectSearchCriteriaType>(); private static Set<String> supportedCredentialTypes = new HashSet<String>(); @@ -155,10 +155,10 @@ static { // List all supported controls classes - supportedIdentityObjectSearchControls.add(IdentityObjectSearchConstraintType.ATTRIBUTE_FILTER); - supportedIdentityObjectSearchControls.add(IdentityObjectSearchConstraintType.NAME_FILTER); - supportedIdentityObjectSearchControls.add(IdentityObjectSearchConstraintType.PAGE); - supportedIdentityObjectSearchControls.add(IdentityObjectSearchConstraintType.SORT); + supportedIdentityObjectSearchControls.add(IdentityObjectSearchCriteriaType.ATTRIBUTE_FILTER); + supportedIdentityObjectSearchControls.add(IdentityObjectSearchCriteriaType.NAME_FILTER); + supportedIdentityObjectSearchControls.add(IdentityObjectSearchCriteriaType.PAGE); + supportedIdentityObjectSearchControls.add(IdentityObjectSearchCriteriaType.SORT); // credential types supported by this impl supportedCredentialTypes.add(CREDENTIAL_TYPE_PASSWORD); @@ -600,7 +600,7 @@ @SuppressWarnings("unchecked") public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext ctx, IdentityObjectType identityType, - IdentityObjectSearchConstraints constraints) throws IdentityException + IdentityObjectSearchCriteria constraints) throws IdentityException { checkIOType(identityType); @@ -684,7 +684,7 @@ IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints constraints) throws IdentityException + IdentityObjectSearchCriteria constraints) throws IdentityException { //TODO:test @@ -1110,7 +1110,7 @@ return name; } - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchConstraints constraints) throws IdentityException, OperationNotSupportedException + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria constraints) throws IdentityException, OperationNotSupportedException { Set<String> names = null; @@ -1173,10 +1173,10 @@ public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx) throws IdentityException, OperationNotSupportedException { - return getRelationshipNames(ctx, (IdentityObjectSearchConstraints)null); + return getRelationshipNames(ctx, (IdentityObjectSearchCriteria)null); } - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectSearchConstraints constraints) throws IdentityException, OperationNotSupportedException + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectSearchCriteria constraints) throws IdentityException, OperationNotSupportedException { Set<String> names; Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2009-03-23 19:50:51 UTC (rev 400) @@ -78,8 +78,8 @@ import org.jboss.identity.idm.spi.store.IdentityStore; import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; import org.jboss.identity.idm.spi.store.IdentityStoreSession; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> @@ -102,8 +102,8 @@ IdentityStoreConfigurationMetaData configurationMD; - private static Set<IdentityObjectSearchConstraintType> supportedSearchConstraintTypes = - new HashSet<IdentityObjectSearchConstraintType>(); + private static Set<IdentityObjectSearchCriteriaType> supportedSearchConstraintTypes = + new HashSet<IdentityObjectSearchCriteriaType>(); // <IdentityObjectType name, <Attribute name, MD> private Map<String, Map<String, IdentityObjectAttributeMetaData>> attributesMetaData = new HashMap<String, Map<String, IdentityObjectAttributeMetaData>>(); @@ -112,9 +112,9 @@ // List all supported controls classes //TODO: attribute filter - supportedSearchConstraintTypes.add(IdentityObjectSearchConstraintType.SORT); - supportedSearchConstraintTypes.add(IdentityObjectSearchConstraintType.PAGE); - supportedSearchConstraintTypes.add(IdentityObjectSearchConstraintType.NAME_FILTER); + supportedSearchConstraintTypes.add(IdentityObjectSearchCriteriaType.SORT); + supportedSearchConstraintTypes.add(IdentityObjectSearchCriteriaType.PAGE); + supportedSearchConstraintTypes.add(IdentityObjectSearchCriteriaType.NAME_FILTER); //supportedSearchControls.add(AttributeFilterSearchControl.class); } @@ -551,7 +551,7 @@ public Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType type, - IdentityObjectSearchConstraints constraints) throws IdentityException + IdentityObjectSearchCriteria constraints) throws IdentityException { //TODO: page control with LDAP request control @@ -708,7 +708,7 @@ IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints constraints) throws IdentityException + IdentityObjectSearchCriteria constraints) throws IdentityException { //TODO: relationshipType is ignored - maybe check and allow only MEMBERSHIP? @@ -1324,7 +1324,7 @@ throw new OperationNotSupportedException("Named relationships are not supported by this implementation of LDAP IdentityStore"); } - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { throw new OperationNotSupportedException("Named relationships are not supported by this implementation of LDAP IdentityStore"); } @@ -1334,7 +1334,7 @@ throw new OperationNotSupportedException("Named relationships are not supported by this implementation of LDAP IdentityStore"); } - public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException + public Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException { throw new OperationNotSupportedException("Named relationships are not supported by this implementation of LDAP IdentityStore"); @@ -2058,7 +2058,7 @@ } //TODO: dummy and inefficient temporary workaround. Need to be implemented with ldap request control - private List<IdentityObject> cutPageFromResults(List<IdentityObject> objects, IdentityObjectSearchConstraints constraints) + private List<IdentityObject> cutPageFromResults(List<IdentityObject> objects, IdentityObjectSearchCriteria constraints) { List<IdentityObject> results = new LinkedList<IdentityObject>(); for (int i = constraints.getFirstResult(); i < constraints.getFirstResult() + constraints.getMaxResults(); i++) Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/PersistenceManagerTest.java 2009-03-23 19:50:51 UTC (rev 400) @@ -26,7 +26,7 @@ import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.User; import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.IdentitySearchConstraints; +import org.jboss.identity.idm.api.IdentitySearchCriteria; import junit.framework.Assert; @@ -131,7 +131,7 @@ id = session.getPersistenceManager().createGroupId("groupName3", PROJECT); session.getPersistenceManager().removeGroup(id, false); - assertEquals(0, session.getPersistenceManager().findGroup(ORGANIZATION, (IdentitySearchConstraints)null).size()); + assertEquals(0, session.getPersistenceManager().findGroup(ORGANIZATION, (IdentitySearchCriteria)null).size()); assertEquals(0, session.getPersistenceManager().findGroup(PROJECT).size()); assertEquals(0, session.getPersistenceManager().findGroup(DEPARTMENT).size()); @@ -157,7 +157,7 @@ //TODO: this should throw some meaningfull exception or simply return null //assertNull(session.getPersistenceManager().findUser("olaf")); - assertEquals(2, session.getPersistenceManager().findUser((IdentitySearchConstraints)null).size()); + assertEquals(2, session.getPersistenceManager().findUser((IdentitySearchCriteria)null).size()); session.getPersistenceManager().removeUser(u1, false); @@ -167,7 +167,7 @@ assertEquals(0, session.getPersistenceManager().getUserCount()); - assertEquals(0, session.getPersistenceManager().findUser((IdentitySearchConstraints)null).size()); + assertEquals(0, session.getPersistenceManager().findUser((IdentitySearchCriteria)null).size()); session.getTransaction().commit(); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/RelationshipManagerTest.java 2009-03-23 19:50:51 UTC (rev 400) @@ -26,7 +26,7 @@ import org.jboss.identity.idm.api.Group; import org.jboss.identity.idm.api.User; import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.IdentitySearchConstraints; +import org.jboss.identity.idm.api.IdentitySearchCriteria; import java.util.Arrays; @@ -358,10 +358,10 @@ assertEquals(0, session.getRelationshipManager().findAssociatedUsers(group2, false, null).size()); assertEquals(1, session.getRelationshipManager().findRelatedUsers(group2, null).size()); - assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user3, (IdentitySearchConstraints)null).size()); + assertEquals(0, session.getRelationshipManager().findAssociatedGroups(user3, (IdentitySearchCriteria)null).size()); assertEquals(2, session.getRelationshipManager().findRelatedGroups(user3, null, null).size()); - assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user2, (IdentitySearchConstraints)null).size()); + assertEquals(1, session.getRelationshipManager().findAssociatedGroups(user2, (IdentitySearchCriteria)null).size()); assertEquals(2, session.getRelationshipManager().findRelatedGroups(user2, null, null).size()); session.getTransaction().commit(); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java 2009-03-23 19:50:51 UTC (rev 400) @@ -25,12 +25,12 @@ import org.jboss.identity.idm.spi.model.IdentityObject; import org.jboss.identity.idm.spi.model.IdentityObjectCredential; import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; -import org.jboss.identity.idm.spi.store.IdentityObjectSearchConstraintType; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; +import org.jboss.identity.idm.spi.store.IdentityObjectSearchCriteriaType; import org.jboss.identity.idm.impl.api.PasswordCredential; import org.jboss.identity.idm.impl.api.BinaryCredential; import org.jboss.identity.idm.impl.api.SimpleAttribute; -import org.jboss.identity.idm.impl.api.IdentitySearchConstraintsImpl; +import org.jboss.identity.idm.impl.api.IdentitySearchCriteriaImpl; import org.jboss.identity.idm.api.SortOrder; import java.util.Collection; @@ -370,50 +370,50 @@ IdentityObject group8 = testContext.getStore().createIdentityObject(testContext.getCtx(), "Entity3", IdentityTypeEnum.USER); Collection<IdentityObject> results = null; - IdentityObjectSearchConstraints constraints = null; + IdentityObjectSearchCriteria constraints = null; // TODO: by RelationshipType if (testContext.getStore().getSupportedFeatures(). - isSearchConstraintTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchConstraintType.NAME_FILTER)) + isSearchCriteriaTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchCriteriaType.NAME_FILTER)) { - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().idFilter("*"); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().idFilter("*"); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); assertEquals(8, results.size()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().idFilter("D*"); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().idFilter("D*"); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); assertEquals(3, results.size()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().idFilter("*2"); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().idFilter("*2"); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); assertEquals(3, results.size()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().idFilter("*3"); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().idFilter("*3"); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); assertEquals(2, results.size()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().idFilter("Company1"); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().idFilter("Company1"); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); assertEquals(1, results.size()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().idFilter("Toronto"); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().idFilter("Toronto"); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); @@ -423,17 +423,17 @@ if (testContext.getStore().getSupportedFeatures(). - isSearchConstraintTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchConstraintType.PAGE)) + isSearchCriteriaTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchCriteriaType.PAGE)) { - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().page(0, 3); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().page(0, 3); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); assertEquals(3, results.size()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().page(2, 2); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().page(2, 2); results = testContext.getStore(). @@ -443,11 +443,11 @@ } if (testContext.getStore().getSupportedFeatures(). - isSearchConstraintTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchConstraintType.SORT)) + isSearchCriteriaTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchCriteriaType.SORT)) { - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().sort(SortOrder.ASCENDING); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().sort(SortOrder.ASCENDING); results = testContext.getStore(). @@ -461,7 +461,7 @@ // And reverse order - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().sort(SortOrder.DESCENDING); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().sort(SortOrder.DESCENDING); results = testContext.getStore(). @@ -479,10 +479,10 @@ // Combine controls to check that the results are diffrent for pagination if (testContext.getStore().getSupportedFeatures(). - isSearchConstraintTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchConstraintType.PAGE)) + isSearchCriteriaTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchCriteriaType.PAGE)) { - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().sort(SortOrder.ASCENDING).page(0,3); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().sort(SortOrder.ASCENDING).page(0,3); @@ -493,7 +493,7 @@ assertEquals("Company1", ((List<IdentityObject>)results).get(0).getName()); assertEquals("Division1", ((List<IdentityObject>)results).get(2).getName()); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl().sort(SortOrder.ASCENDING).page(3,1); + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl().sort(SortOrder.ASCENDING).page(3,1); results = testContext.getStore(). findIdentityObject(testContext.getCtx(), IdentityTypeEnum.USER, constraints); @@ -508,7 +508,7 @@ } if (testContext.getStore().getSupportedFeatures(). - isSearchConstraintTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchConstraintType.ATTRIBUTE_FILTER)) + isSearchCriteriaTypeSupported(IdentityTypeEnum.USER, IdentityObjectSearchCriteriaType.ATTRIBUTE_FILTER)) { IdentityObjectAttribute phone = new SimpleAttribute("phone", new String[] {"777 777 777"}); @@ -516,7 +516,7 @@ testContext.getStore().addAttributes(testContext.getCtx(), group1, new IdentityObjectAttribute[]{phone, description}); - constraints = (IdentityObjectSearchConstraints)new IdentitySearchConstraintsImpl() + constraints = (IdentityObjectSearchCriteria)new IdentitySearchCriteriaImpl() .attributeValuesFilter("phone", new String[] {"777 777 777"}) .attributeValuesFilter("description", new String[] {"sample desc"}); Deleted: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraintType.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraintType.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraintType.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,38 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - - -package org.jboss.identity.idm.api; - - - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public enum IdentitySearchConstraintType -{ - SORT, - PAGE, - NAME_FILTER, - ATTRIBUTE_FILTER -} Deleted: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraints.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraints.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraints.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,43 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.api; - - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public interface IdentitySearchConstraints -{ - - IdentitySearchConstraints sort(SortOrder order) throws UnsupportedConstraint; - - IdentitySearchConstraints sortAttributeName(String name) throws UnsupportedConstraint; - - IdentitySearchConstraints page(int firstResult, int maxResults) throws UnsupportedConstraint; - - IdentitySearchConstraints attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedConstraint; - - IdentitySearchConstraints idFilter(String filter) throws UnsupportedConstraint; - -} Copied: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java (from rev 398, idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraints.java) =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java (rev 0) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteria.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,43 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.api; + + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public interface IdentitySearchCriteria +{ + + IdentitySearchCriteria sort(SortOrder order) throws UnsupportedCriterium; + + IdentitySearchCriteria sortAttributeName(String name) throws UnsupportedCriterium; + + IdentitySearchCriteria page(int firstResult, int maxResults) throws UnsupportedCriterium; + + IdentitySearchCriteria attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedCriterium; + + IdentitySearchCriteria idFilter(String filter) throws UnsupportedCriterium; + +} Copied: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteriumType.java (from rev 398, idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchConstraintType.java) =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteriumType.java (rev 0) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/IdentitySearchCriteriumType.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,38 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + + +package org.jboss.identity.idm.api; + + + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public enum IdentitySearchCriteriumType +{ + SORT, + PAGE, + NAME_FILTER, + ATTRIBUTE_FILTER +} Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManager.java 2009-03-23 19:50:51 UTC (rev 400) @@ -46,7 +46,7 @@ */ PersistenceManagerFeaturesDescription getFeaturesDescription(); - IdentitySearchConstraints createIdentitySearchConstraints(); + IdentitySearchCriteria createIdentitySearchConstraints(); // Create @@ -153,7 +153,7 @@ * @return * @throws IdentityException */ - Collection<User> findUser(IdentitySearchConstraints controls) throws IdentityException; + Collection<User> findUser(IdentitySearchCriteria controls) throws IdentityException; // Search Groups @@ -184,7 +184,7 @@ * @return * @throws IdentityException */ - Collection<Group> findGroup(String groupType, IdentitySearchConstraints controls) throws IdentityException; + Collection<Group> findGroup(String groupType, IdentitySearchCriteria controls) throws IdentityException; /** * Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/PersistenceManagerFeaturesDescription.java 2009-03-23 19:50:51 UTC (rev 400) @@ -48,18 +48,18 @@ /** * Check if control can be used in Identity search methods * - * @param constraint + * @param criteriumType * @return */ - boolean isUsersSearchConstraintTypeSupported(IdentitySearchConstraintType constraint); + boolean isUsersSearchCriteriumTypeSupported(IdentitySearchCriteriumType criteriumType); /** * Check if control can be used in Group search methods * * @param groupType - * @param constraint + * @param criteriumType * @return */ - boolean isGroupsSearchConstraintTypeSupported(String groupType, IdentitySearchConstraintType constraint); + boolean isGroupsSearchCriteriumTypeSupported(String groupType, IdentitySearchCriteriumType criteriumType); } \ No newline at end of file Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManager.java 2009-03-23 19:50:51 UTC (rev 400) @@ -45,7 +45,7 @@ */ RelationshipManagerFeaturesDescription getFeaturesDescription(); - IdentitySearchConstraints createIdentitySearchConstraints(); + IdentitySearchCriteria createIdentitySearchConstraints(); // Assignation @@ -308,7 +308,7 @@ String groupType, boolean parent, boolean inherited, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find groups that are associated with given group. @@ -328,7 +328,7 @@ String groupType, boolean parent, boolean inherited, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all groups that given identity is associated with. @@ -350,7 +350,7 @@ */ Collection<Group> findAssociatedGroups(User user, String groupType, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all groups that given identity is associated with. @@ -362,7 +362,7 @@ */ Collection<Group> findAssociatedGroups(String userId, String groupType, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all groups that given identity is associated with. @@ -372,7 +372,7 @@ * @throws org.jboss.identity.idm.exception.IdentityException */ Collection<Group> findAssociatedGroups(User user, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all groups that given identity is associated with. @@ -382,7 +382,7 @@ * @throws org.jboss.identity.idm.exception.IdentityException */ Collection<Group> findAssociatedGroups(String userId, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all groups that given identity is associated with. @@ -414,7 +414,7 @@ */ Collection<User> findAssociatedUsers(Group group, boolean inherited, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find identities that have relationship with given parent group. @@ -426,7 +426,7 @@ */ Collection<User> findAssociatedUsers(String groupId, boolean inherited, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** @@ -439,7 +439,7 @@ */ Collection<Group> findRelatedGroups(User user, String groupType, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all groups that given identity is associated with. Will return groups connected with a given user with a role @@ -451,7 +451,7 @@ */ Collection<Group> findRelatedGroups(String userId, String groupType, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find identities that have relationship with given parent group. Will return users connected with a given group with a role @@ -460,7 +460,7 @@ * @return * @throws org.jboss.identity.idm.exception.IdentityException */ - Collection<User> findRelatedUsers(Group group, IdentitySearchConstraints controls) throws IdentityException; + Collection<User> findRelatedUsers(Group group, IdentitySearchCriteria controls) throws IdentityException; /** * Find identities that have relationship with given parent group. Will return users connected with a given group with a role @@ -469,7 +469,7 @@ * @return * @throws org.jboss.identity.idm.exception.IdentityException */ - Collection<User> findRelatedUsers(String groupId, IdentitySearchConstraints controls) throws IdentityException; + Collection<User> findRelatedUsers(String groupId, IdentitySearchCriteria controls) throws IdentityException; } Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RelationshipManagerFeaturesDescription.java 2009-03-23 19:50:51 UTC (rev 400) @@ -49,18 +49,18 @@ /** * Check if control can be used in Identity search methods * - * @param constraint + * @param criteriumType * @return */ - boolean isIdentitiesSearchConstraintTypeSupported(IdentitySearchConstraintType constraint); + boolean isIdentitiesSearchCriteriumTypeSupported(IdentitySearchCriteriumType criteriumType); /** * Check if control can be used in Group search methods * * @param groupType - * @param constraintType + * @param criteriumType * @return */ - boolean isGroupsSearchConstraintTypeSupported(String groupType, IdentitySearchConstraintType constraintType); + boolean isGroupsSearchCriteriumTypeSupported(String groupType, IdentitySearchCriteriumType criteriumType); } \ No newline at end of file Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManager.java 2009-03-23 19:50:51 UTC (rev 400) @@ -46,7 +46,7 @@ */ RoleManagerFeaturesDescription getSupportedFeatures(); - IdentitySearchConstraints createIdentitySearchConstraints(); + IdentitySearchCriteria createIdentitySearchConstraints(); // RoleType @@ -85,7 +85,7 @@ * @return * @throws IdentityException */ - Collection<RoleType> findRoleTypes(IdentitySearchConstraints controls) throws IdentityException; + Collection<RoleType> findRoleTypes(IdentitySearchCriteria controls) throws IdentityException; // Role @@ -162,7 +162,7 @@ * @throws IdentityException */ Collection<RoleType> findRoleTypes(User user, Group group, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find RoleType objects for roles associated with a given User and Group @@ -172,7 +172,7 @@ * @throws IdentityException */ Collection<RoleType> findRoleTypes(String userId, String groupId, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find RoleType objects for roles associated with a given User and Group @@ -197,7 +197,7 @@ * @return * @throws IdentityException */ - Collection<RoleType> findUserRoleTypes(User user, IdentitySearchConstraints controls) throws IdentityException; + Collection<RoleType> findUserRoleTypes(User user, IdentitySearchCriteria controls) throws IdentityException; /** * Find RoleType objects for roles associated with a given Identity @@ -205,7 +205,7 @@ * @return * @throws IdentityException */ - Collection<RoleType> findUserRoleTypes(String userId, IdentitySearchConstraints controls) throws IdentityException; + Collection<RoleType> findUserRoleTypes(String userId, IdentitySearchCriteria controls) throws IdentityException; /** * Find RoleType objects for roles associated with a given Group @@ -222,7 +222,7 @@ * @throws IdentityException */ Collection<RoleType> findGroupRoleTypes(Group group, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find RoleType objects for roles associated with a given Group @@ -231,7 +231,7 @@ * @throws IdentityException */ Collection<RoleType> findGroupRoleTypes(String groupId, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all Groups with which User has a Role association @@ -242,7 +242,7 @@ * @throws IdentityException */ Collection<Group> findGroupsWithRelatedRole(User user, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all Groups with which User has a Role association @@ -253,7 +253,7 @@ * @throws IdentityException */ Collection<Group> findGroupsWithRelatedRole(String userId, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** @@ -266,7 +266,7 @@ */ Collection<Group> findGroupsWithRelatedRole(User user, String groupType, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find all Groups with which User has a Role association @@ -278,7 +278,7 @@ */ Collection<Group> findGroupsWithRelatedRole(String userId, String groupType, - IdentitySearchConstraints controls) throws IdentityException; + IdentitySearchCriteria controls) throws IdentityException; /** * Find Role objects with a given RoleType associated with a given IdentityType Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/RoleManagerFeaturesDescription.java 2009-03-23 19:50:51 UTC (rev 400) @@ -37,8 +37,8 @@ boolean isRoleTypeAddRemoveSupported(); /** - * @param constraintType + * @param criteriumType * @return */ - boolean isRoleTypeSearchConstraintTypeSupported(IdentitySearchConstraintType constraintType); + boolean isRoleTypeSearchCriteriumTypeSupported(IdentitySearchCriteriumType criteriumType); } \ No newline at end of file Deleted: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedConstraint.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedConstraint.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedConstraint.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,50 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.api; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class UnsupportedConstraint extends Exception -{ - public UnsupportedConstraint() - { - super(); - } - - public UnsupportedConstraint(String message) - { - super(message); - } - - public UnsupportedConstraint(String message, Throwable cause) - { - super(message, cause); - } - - public UnsupportedConstraint(Throwable cause) - { - super(cause); - } -} Copied: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedCriterium.java (from rev 398, idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedConstraint.java) =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedCriterium.java (rev 0) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/UnsupportedCriterium.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,50 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.api; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class UnsupportedCriterium extends Exception +{ + public UnsupportedCriterium() + { + super(); + } + + public UnsupportedCriterium(String message) + { + super(message); + } + + public UnsupportedCriterium(String message, Throwable cause) + { + super(message, cause); + } + + public UnsupportedCriterium(Throwable cause) + { + super(cause); + } +} Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/GroupQuery.java 2009-03-23 19:50:51 UTC (rev 400) @@ -78,13 +78,13 @@ GroupQuery addRelatedUser(String id); - GroupQuery sort(SortOrder order) throws UnsupportedQueryConstraint; + GroupQuery sort(SortOrder order) throws UnsupportedQueryCriterium; - GroupQuery sortAttributeName(String name) throws UnsupportedQueryConstraint; + GroupQuery sortAttributeName(String name) throws UnsupportedQueryCriterium; - GroupQuery page(int firstResult, int maxResults) throws UnsupportedQueryConstraint; + GroupQuery page(int firstResult, int maxResults) throws UnsupportedQueryCriterium; - GroupQuery attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedQueryConstraint; + GroupQuery attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedQueryCriterium; Deleted: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryConstraint.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryConstraint.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryConstraint.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,51 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.api.query; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class UnsupportedQueryConstraint extends QueryException -{ - - public UnsupportedQueryConstraint() - { - super(); - } - - public UnsupportedQueryConstraint(String message) - { - super(message); - } - - public UnsupportedQueryConstraint(String message, Throwable cause) - { - super(message, cause); - } - - public UnsupportedQueryConstraint(Throwable cause) - { - super(cause); - } -} Copied: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryCriterium.java (from rev 392, idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryConstraint.java) =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryCriterium.java (rev 0) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UnsupportedQueryCriterium.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,51 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.api.query; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class UnsupportedQueryCriterium extends QueryException +{ + + public UnsupportedQueryCriterium() + { + super(); + } + + public UnsupportedQueryCriterium(String message) + { + super(message); + } + + public UnsupportedQueryCriterium(String message, Throwable cause) + { + super(message, cause); + } + + public UnsupportedQueryCriterium(Throwable cause) + { + super(cause); + } +} Modified: idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java =================================================================== --- idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-api/src/main/java/org/jboss/identity/idm/api/query/UserQuery.java 2009-03-23 19:50:51 UTC (rev 400) @@ -67,12 +67,12 @@ UserQuery addRelatedGroupsIds(Collection<String> ids); - UserQuery sort(SortOrder order) throws UnsupportedQueryConstraint; + UserQuery sort(SortOrder order) throws UnsupportedQueryCriterium; - UserQuery sortAttributeName(String name) throws UnsupportedQueryConstraint; + UserQuery sortAttributeName(String name) throws UnsupportedQueryCriterium; - UserQuery page(int firstResult, int maxResults) throws UnsupportedQueryConstraint; + UserQuery page(int firstResult, int maxResults) throws UnsupportedQueryCriterium; - UserQuery attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedQueryConstraint; + UserQuery attributeValuesFilter(String attributeName, String[] attributeValue) throws UnsupportedQueryCriterium; } Deleted: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchConstraints.java =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchConstraints.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchConstraints.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,50 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.spi.search; - -import java.util.Map; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public interface IdentityObjectSearchConstraints -{ - boolean isSorted(); - - boolean isAscending(); - - String getSortAttributeName(); - - boolean isPaged(); - - int getFirstResult(); - - int getMaxResults(); - - boolean isFiltered(); - - String getFilter(); - - Map<String, String[]> getValues(); -} Copied: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchCriteria.java (from rev 398, idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchConstraints.java) =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchCriteria.java (rev 0) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/search/IdentityObjectSearchCriteria.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,50 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.spi.search; + +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public interface IdentityObjectSearchCriteria +{ + boolean isSorted(); + + boolean isAscending(); + + String getSortAttributeName(); + + boolean isPaged(); + + int getFirstResult(); + + int getMaxResults(); + + boolean isFiltered(); + + String getFilter(); + + Map<String, String[]> getValues(); +} Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/FeaturesMetaData.java 2009-03-23 19:50:51 UTC (rev 400) @@ -59,14 +59,14 @@ * @param storeSearchConstraint * @return */ - boolean isSearchConstraintTypeSupported(IdentityObjectType identityObjectType, IdentityObjectSearchConstraintType storeSearchConstraint); + boolean isSearchCriteriaTypeSupported(IdentityObjectType identityObjectType, IdentityObjectSearchCriteriaType storeSearchConstraint); /** * * @param constraint * @return */ - boolean isRoleNameSearchConstraintSupported(IdentityObjectSearchConstraintType constraint); + boolean isRoleNameSearchCriteriaTypeSupported(IdentityObjectSearchCriteriaType constraint); /** * @return set of identity types that can be persisted Deleted: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchConstraintType.java =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchConstraintType.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchConstraintType.java 2009-03-23 19:50:51 UTC (rev 400) @@ -1,36 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - - -package org.jboss.identity.idm.spi.store;/** - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public enum IdentityObjectSearchConstraintType -{ - SORT, - PAGE, - NAME_FILTER, - ATTRIBUTE_FILTER -} Copied: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchCriteriaType.java (from rev 398, idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchConstraintType.java) =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchCriteriaType.java (rev 0) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityObjectSearchCriteriaType.java 2009-03-23 19:50:51 UTC (rev 400) @@ -0,0 +1,36 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + + +package org.jboss.identity.idm.spi.store;/** + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public enum IdentityObjectSearchCriteriaType +{ + SORT, + PAGE, + NAME_FILTER, + ATTRIBUTE_FILTER +} Modified: idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityStore.java =================================================================== --- idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityStore.java 2009-03-23 19:25:19 UTC (rev 399) +++ idm/trunk/idm-spi/src/main/java/org/jboss/identity/idm/spi/store/IdentityStore.java 2009-03-23 19:50:51 UTC (rev 400) @@ -31,10 +31,9 @@ import org.jboss.identity.idm.spi.model.IdentityObjectRelationshipType; import org.jboss.identity.idm.spi.model.IdentityObjectRelationship; import org.jboss.identity.idm.spi.exception.OperationNotSupportedException; -import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; import org.jboss.identity.idm.spi.model.IdentityObjectCredential; -import org.jboss.identity.idm.spi.search.IdentityObjectSearchConstraints; +import org.jboss.identity.idm.spi.search.IdentityObjectSearchCriteria; import org.jboss.identity.idm.exception.IdentityException; /** @@ -151,7 +150,7 @@ */ Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCtx, IdentityObjectType identityType, - IdentityObjectSearchConstraints controls) throws IdentityException; + IdentityObjectSearchCriteria controls) throws IdentityException; /** * Find identites that have relationship with given identity. Relationships are directional (from parent to child). * @@ -167,7 +166,7 @@ Collection<IdentityObject> findIdentityObject(IdentityStoreInvocationContext invocationCxt, IdentityObject identity, IdentityObjectRelationshipType relationshipType, boolean parent, - IdentityObjectSearchConstraints controls) throws IdentityException; + IdentityObjectSearchCriteria controls) throws IdentityException; @@ -282,7 +281,7 @@ * @throws OperationNotSupportedException */ Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, - IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException; + IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException; /** @@ -296,7 +295,7 @@ */ Set<String> getRelationshipNames(IdentityStoreInvocationContext ctx, IdentityObject identity, - IdentityObjectSearchConstraints controls) throws IdentityException, OperationNotSupportedException; + IdentityObjectSearchCriteria controls) throws IdentityException, OperationNotSupportedException; // Credentials