diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java index 3536186fd5..31332d3827 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java @@ -18,6 +18,7 @@ import static com.google.common.base.Strings.nullToEmpty; import com.google.common.collect.Lists; import com.google.gerrit.common.errors.NoSuchGroupException; +import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.AccountGroupIncludeByUuid; @@ -51,9 +52,9 @@ public class ListIncludedGroups implements RestReadView { @Override public List apply(GroupResource rsrc) - throws ResourceNotFoundException, OrmException { + throws MethodNotAllowedException, ResourceNotFoundException, OrmException { if (rsrc.toAccountGroup() == null) { - throw new ResourceNotFoundException(rsrc.getGroupUUID().get()); + throw new MethodNotAllowedException(); } boolean ownerOfParent = rsrc.getControl().isOwner(); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java index f586d55754..a9aae17794 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java @@ -20,6 +20,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.gerrit.common.data.GroupDetail; import com.google.gerrit.common.errors.NoSuchGroupException; +import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Account; @@ -59,9 +60,9 @@ public class ListMembers implements RestReadView { @Override public List apply(final GroupResource resource) - throws ResourceNotFoundException, OrmException { + throws MethodNotAllowedException, ResourceNotFoundException, OrmException { if (resource.toAccountGroup() == null) { - throw new ResourceNotFoundException(resource.getGroupUUID().get()); + throw new MethodNotAllowedException(); } try { final Map members =