[jboss-identity-commits] JBoss Identity SVN: r61 - in trunk: identity-impl/src/main/java/org/jboss/identity/impl/types and 3 other directories.

Author: bdaw Date: 2008-09-04 15:41:50 -0400 (Thu, 04 Sep 2008) New Revision: 61 Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java trunk/identity-model/src/main/java/org/jboss/identity/model/Identity.java trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java Log: - Remove direct getters connection from identity interfaces as with big number of entities paginated searches are needed - Use only getIdentityType in Role and Group - Some extensions to FeaturesDescription Modified: trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java =================================================================== --- trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-api/src/main/java/org/jboss/identity/api/store/FeaturesDescription.java 2008-09-04 19:41:50 UTC (rev 61) @@ -22,6 +22,7 @@ package org.jboss.identity.api.store; import java.util.Set; +import java.util.Map; import org.jboss.identity.api.exception.IdentityException; import org.jboss.identity.api.exception.IdentityTypeNotSupportedException; @@ -83,4 +84,15 @@ boolean isRelationshipSupported(IdentityType fromType, IdentityType toType, RelationshipType relationshipType) throws IdentityException; + + /** + * @return Set of RelationshipType supported in this store + */ + Set<RelationshipType> getSupportedRelationshipTypes(); + + /** + * @return A mapping of RelationshipType and IdentityType objects that can have such relationship in this store + */ + Map<RelationshipType, Map<IdentityType, IdentityType>> getSupportedRelationshipTypeMappings(); + } \ No newline at end of file Modified: trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java =================================================================== --- trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-impl/src/main/java/org/jboss/identity/impl/types/SimpleGroup.java 2008-09-04 19:41:50 UTC (rev 61) @@ -28,6 +28,7 @@ import org.jboss.identity.model.roles.Role; import org.jboss.identity.model.IdentityType; import org.jboss.identity.model.groups.Group; +import org.jboss.identity.model.groups.GroupType; import org.jboss.identity.model.policy.PolicyValidationException; import org.jboss.identity.model.policy.RelationshipPolicy; @@ -65,27 +66,29 @@ return name; } - public Group getParent() + public List<IdentityAttribute> getAttributes() { return null; } - public List<Role> getRoles() + public void validatePolicy() throws PolicyValidationException { - return null; } - public List<Group> getSubGroups() + public String getDisplayName() { return null; } - public List<IdentityAttribute> getAttributes() + public String getDescription() { return null; } - public void validatePolicy() throws PolicyValidationException + public GroupType getGroupType() { + return null; } + + } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/Identity.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/Identity.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/Identity.java 2008-09-04 19:41:50 UTC (rev 61) @@ -35,16 +35,4 @@ public interface Identity extends IdentityObject { - - /** - * <p>Return a list of Roles</p> - * @return - */ - List<Role> getRoles(); - - /** - * <p>Return a list of groups</p> - * @return - */ - List<Group> getGroups(); } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/IdentityType.java 2008-09-04 19:41:50 UTC (rev 61) @@ -24,6 +24,7 @@ import java.util.List; import org.jboss.identity.model.policy.PolicyValidationException; +import org.jboss.identity.model.policy.RelationshipPolicy; /** * Marker Interface representing @@ -39,6 +40,12 @@ * @return */ String getName(); - + + /** + * Return a list of relationship policies + * @return + */ + List<RelationshipPolicy<IdentityType,IdentityType>> getRelationshipPolicies(); + } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/Group.java 2008-09-04 19:41:50 UTC (rev 61) @@ -39,31 +39,16 @@ */ public interface Group extends IdentityObject { - /** - * <p>Get the name</p> - * @return - */ - String getName(); - - /** - * <p>Get the list of roles</p> - * @return - */ - List<Role> getRoles(); - - /** - * <p>Get the parent group in hierarchy.</p> - * <p> May be <i>Null<i>.</p> - * @return - */ - Group getParent(); - - /** - * <p>Get the subgroups contained.</p> - * <p>May be <i>Null<i>.</p> - * @return - */ - List<Group> getSubGroups(); - + /** + * @return group display name + */ + String getDisplayName(); + + /** + * @return description + */ + String getDescription(); + + } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/GroupType.java 2008-09-04 19:41:50 UTC (rev 61) @@ -35,22 +35,7 @@ */ public interface GroupType extends IdentityType { - /** - * Add a relationship policy - * @param aRelationPolicy - */ - void add(RelationshipPolicy<GroupType,GroupType> aRelationPolicy); - /** - * Add a collection of relationship policies - * @param relationList - */ - void addAll(Collection<RelationshipPolicy<GroupType,GroupType>> relationList); - /** - * Return a list of relationship policies - * @return - */ - List<RelationshipPolicy<GroupType,GroupType>> getRelationshipPolicies(); } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/groups/SimpleGroupType.java 2008-09-04 19:41:50 UTC (rev 61) @@ -22,6 +22,7 @@ package org.jboss.identity.model.groups; import org.jboss.identity.model.policy.RelationshipPolicy; +import org.jboss.identity.model.IdentityType; import java.util.Collection; import java.util.List; @@ -56,18 +57,9 @@ return builder.toString(); } - public void add(RelationshipPolicy<GroupType, GroupType> aRelationPolicy) - { - } - - public void addAll(Collection<RelationshipPolicy<GroupType, GroupType>> relationList) + public List<RelationshipPolicy<IdentityType, IdentityType>> getRelationshipPolicies() { - - } - - public List<RelationshipPolicy<GroupType, GroupType>> getRelationshipPolicies() - { return null; } } Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/roles/Role.java 2008-09-04 19:41:50 UTC (rev 61) @@ -34,21 +34,16 @@ */ public interface Role extends IdentityObject { + /** - * Get the type of role - * @return + * @return group display name */ - RoleType getRoleType(); + String getDisplayName(); /** - * Get a list of Identities - * @return + * @return description */ - List<Identity> getIdentities(); + String getDescription(); - /** - * Get a list of Groups - * @return - */ - List<Group> getGroups(); + } \ No newline at end of file Modified: trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java =================================================================== --- trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java 2008-09-03 15:44:20 UTC (rev 60) +++ trunk/identity-model/src/main/java/org/jboss/identity/model/roles/RoleType.java 2008-09-04 19:41:50 UTC (rev 61) @@ -22,7 +22,10 @@ package org.jboss.identity.model.roles; import org.jboss.identity.model.IdentityType; +import org.jboss.identity.model.policy.RelationshipPolicy; +import java.util.List; + /** * Type of Role * @author Anil.Saldhana(a)redhat.com @@ -54,4 +57,11 @@ { return this.name(); } + + public List<RelationshipPolicy<IdentityType, IdentityType>> getRelationshipPolicies() + { + return null; + } + + } \ No newline at end of file