Allow group includes to be by UUID instead of group ID

Per discussion on-list, the behavior change in 2.5 to only
allow groups by ID is considered a regression for groups
that want to include external groups (like LDAP).

In order to permit smooth migration, we want to allow both
ID and UUIDs to co-exist for the time being.

Change-Id: I0dbdb15b9c62f2dbce64acbc34c515c7b8229c04
This commit is contained in:
Chad Horohoe
2012-12-13 15:00:04 -05:00
parent 57143be354
commit 2cf207f384
24 changed files with 329 additions and 192 deletions

View File

@@ -57,10 +57,10 @@ final class CreateGroupCommand extends SshCommand {
@Option(name = "--visible-to-all", usage = "to make the group visible to all registered users")
private boolean visibleToAll;
private final Set<AccountGroup.Id> initialGroups = new HashSet<AccountGroup.Id>();
private final Set<AccountGroup.UUID> initialGroups = new HashSet<AccountGroup.UUID>();
@Option(name = "--group", aliases = "-g", metaVar = "GROUP", usage = "initial set of groups to be included in the group")
void addGroup(final AccountGroup.Id id) {
void addGroup(final AccountGroup.UUID id) {
initialGroups.add(id);
}