Remove unneeded GroupList class

This wrapper class around List<AccountGroup> is not needed anymore
because none of the users was interested in the canCreateGroup field
anymore.

Change-Id: I6c9ecf8b120f46524707c7c8ed8792468516aa57
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

gerrit-common/src/main/java/com/google/gerrit/common/data/GroupList.java

@@ -1,48 +0,0 @@
-// Copyright (C) 2011 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.common.data;
-
-import com.google.gerrit.reviewdb.client.AccountGroup;
-
-import java.util.List;
-
-public class GroupList {
-  protected List<AccountGroup> groups;
-  protected boolean canCreateGroup;
-
-  protected GroupList() {
-  }
-
-  public GroupList(final List<AccountGroup> groups, final boolean canCreateGroup) {
-    this.groups = groups;
-    this.canCreateGroup = canCreateGroup;
-  }
-
-  public List<AccountGroup> getGroups() {
-    return groups;
-  }
-
-  public void setGroups(List<AccountGroup> groups) {
-    this.groups = groups;
-  }
-
-  public boolean isCanCreateGroup() {
-    return canCreateGroup;
-  }
-
-  public void setCanCreateGroup(boolean set) {
-    canCreateGroup = set;
-  }
-}

gerrit-server/src/main/java/com/google/gerrit/server/account/VisibleGroups.java

@@ -16,7 +16,6 @@ package com.google.gerrit.server.account;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.gerrit.common.data.GroupList;
 import com.google.gerrit.common.data.GroupReference;
 import com.google.gerrit.common.errors.NoSuchGroupException;
 import com.google.gerrit.reviewdb.client.AccountGroup;
@@ -61,11 +60,11 @@ public class VisibleGroups {
     this.groupType = groupType;
   }
 
-  public GroupList get() {
-    return createGroupList(filterGroups(groupCache.all()));
+  public List<AccountGroup> get() {
+    return filterGroups(groupCache.all());
   }
 
-  public GroupList get(final Collection<ProjectControl> projects)
+  public List<AccountGroup> get(final Collection<ProjectControl> projects)
       throws NoSuchGroupException {
     Map<AccountGroup.UUID, AccountGroup> groups = Maps.newHashMap();
     for (final ProjectControl projectControl : projects) {
@@ -78,7 +77,7 @@ public class VisibleGroups {
         groups.put(group.getGroupUUID(), group);
       }
     }
-    return createGroupList(filterGroups(groups.values()));
+    return filterGroups(groups.values());
   }
 
   /**
@@ -87,7 +86,7 @@ public class VisibleGroups {
    * groups.
    * @See GroupMembership#getKnownGroups()
    */
-  public GroupList get(final IdentifiedUser user) throws NoSuchGroupException {
+  public List<AccountGroup> get(final IdentifiedUser user) throws NoSuchGroupException {
     if (identifiedUser.get().getAccountId().equals(user.getAccountId())
         || identifiedUser.get().getCapabilities().canAdministrateServer()) {
       Set<AccountGroup.UUID> mine = user.getEffectiveGroups().getKnownGroups();
@@ -98,7 +97,7 @@ public class VisibleGroups {
           groups.put(groupId, group);
         }
       }
-      return createGroupList(filterGroups(groups.values()));
+      return filterGroups(groups.values());
     } else {
       throw new NoSuchGroupException("Groups of user '" + user.getAccountId()
           + "' are not visible.");
@@ -125,9 +124,4 @@ public class VisibleGroups {
     Collections.sort(filteredGroups, new GroupComparator());
     return filteredGroups;
   }
-
-  private GroupList createGroupList(final List<AccountGroup> groups) {
-    return new GroupList(groups, identifiedUser.get()
-        .getCapabilities().canCreateGroup());
-  }
 }

gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java

@@ -15,7 +15,6 @@
 package com.google.gerrit.server.group;
 
 import com.google.common.collect.Maps;
-import com.google.gerrit.common.data.GroupList;
 import com.google.gerrit.common.errors.NoSuchGroupException;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -113,7 +112,7 @@ public class ListGroups implements RestReadView<TopLevelResource> {
       final VisibleGroups visibleGroups = visibleGroupsFactory.create();
       visibleGroups.setOnlyVisibleToAll(visibleToAll);
       visibleGroups.setGroupType(groupType);
-      final GroupList groupList;
+      final List<AccountGroup> groupList;
       if (!projects.isEmpty()) {
         groupList = visibleGroups.get(projects);
       } else if (user != null) {
@@ -124,7 +123,7 @@ public class ListGroups implements RestReadView<TopLevelResource> {
 
       if (stdout == null) {
         final Map<String, GroupInfo> output = Maps.newTreeMap();
-        for (final AccountGroup g : groupList.getGroups()) {
+        for (final AccountGroup g : groupList) {
           final GroupInfo info = new GroupInfo();
           info.name = g.getName();
           info.groupId = g.getId().get();
@@ -138,7 +137,7 @@ public class ListGroups implements RestReadView<TopLevelResource> {
             new TypeToken<Map<String, GroupInfo>>() {}.getType());
       } else {
         final ColumnFormatter formatter = new ColumnFormatter(stdout, '\t');
-        for (final AccountGroup g : groupList.getGroups()) {
+        for (final AccountGroup g : groupList) {
           formatter.addColumn(g.getName());
           if (verboseOutput) {
             formatter.addColumn(KeyUtil.decode(g.getGroupUUID().toString()));