diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java index 8385c238a8..80660971d7 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupAdminService.java @@ -34,9 +34,4 @@ public interface GroupAdminService extends RemoteJsonService { @SignInRequired void changeGroupDescription(AccountGroup.Id groupId, String description, AsyncCallback callback); - - @Audit - @SignInRequired - void changeGroupOptions(AccountGroup.Id groupId, GroupOptions groupOptions, - AsyncCallback callback); } diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupOptions.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupOptions.java deleted file mode 100644 index c6ed781021..0000000000 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/GroupOptions.java +++ /dev/null @@ -1,36 +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; - -/** - * Options for an {@link AccountGroup}. - */ -public class GroupOptions { - - private boolean visibleToAll; - - protected GroupOptions() { - } - - public GroupOptions(final boolean visibleToAll) { - this.visibleToAll = visibleToAll; - } - - public boolean isVisibleToAll() { - return visibleToAll; - } -} diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java index 2e46ec16b1..9b7cf5cb79 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/GroupAdminServiceImpl.java @@ -16,7 +16,6 @@ package com.google.gerrit.httpd.rpc.account; import com.google.gerrit.common.data.GroupAdminService; import com.google.gerrit.common.data.GroupDetail; -import com.google.gerrit.common.data.GroupOptions; import com.google.gerrit.common.errors.NoSuchGroupException; import com.google.gerrit.httpd.rpc.BaseServiceImplementation; import com.google.gerrit.reviewdb.client.AccountGroup; @@ -76,20 +75,6 @@ class GroupAdminServiceImpl extends BaseServiceImplementation implements }); } - public void changeGroupOptions(final AccountGroup.Id groupId, - final GroupOptions groupOptions, final AsyncCallback callback) { - run(callback, new Action() { - public VoidResult run(final ReviewDb db) throws OrmException, Failure { - final AccountGroup group = db.accountGroups().get(groupId); - assertAmGroupOwner(db, group); - group.setVisibleToAll(groupOptions.isVisibleToAll()); - db.accountGroups().update(Collections.singleton(group)); - groupCache.evict(group); - return VoidResult.INSTANCE; - } - }); - } - private void assertAmGroupOwner(final ReviewDb db, final AccountGroup group) throws Failure { try {