Merge "Never add automatic reviewers to 'private' changes"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/Module.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/Module.java
index bcf586e..60bcb88 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/Module.java
@@ -77,7 +77,6 @@
protected void configure() {
get(PROJECT_KIND, "reviewers").to(GetReviewers.class);
put(PROJECT_KIND, "reviewers").to(PutReviewers.class);
- get(PROJECT_KIND, "suggest_reviewers").to(SuggestProjectReviewers.class);
}
});
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
deleted file mode 100644
index d73d5fb..0000000
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (C) 2016 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.googlesource.gerrit.plugins.reviewers;
-
-import com.google.gerrit.entities.Account;
-import com.google.gerrit.exceptions.StorageException;
-import com.google.gerrit.extensions.client.ReviewerState;
-import com.google.gerrit.extensions.common.AccountVisibility;
-import com.google.gerrit.extensions.common.SuggestedReviewerInfo;
-import com.google.gerrit.extensions.restapi.BadRequestException;
-import com.google.gerrit.extensions.restapi.Response;
-import com.google.gerrit.extensions.restapi.RestReadView;
-import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.permissions.PermissionBackend;
-import com.google.gerrit.server.permissions.PermissionBackendException;
-import com.google.gerrit.server.permissions.ProjectPermission;
-import com.google.gerrit.server.project.ProjectResource;
-import com.google.gerrit.server.restapi.change.ReviewersUtil;
-import com.google.gerrit.server.restapi.change.ReviewersUtil.VisibilityControl;
-import com.google.gerrit.server.restapi.change.SuggestReviewers;
-import com.google.inject.Inject;
-import java.io.IOException;
-import java.util.List;
-import org.eclipse.jgit.errors.ConfigInvalidException;
-import org.eclipse.jgit.lib.Config;
-
-/** Implements a project suggest REST end-point. */
-public class SuggestProjectReviewers extends SuggestReviewers
- implements RestReadView<ProjectResource> {
- private final PermissionBackend permissionBackend;
-
- @Inject
- SuggestProjectReviewers(
- AccountVisibility av,
- @GerritServerConfig Config cfg,
- ReviewersUtil reviewersUtil,
- PermissionBackend permissionBackend) {
- super(av, cfg, reviewersUtil);
- this.permissionBackend = permissionBackend;
- }
-
- @Override
- public Response<List<SuggestedReviewerInfo>> apply(ProjectResource rsrc)
- throws BadRequestException, StorageException, IOException, ConfigInvalidException,
- PermissionBackendException {
- return Response.ok(
- reviewersUtil.suggestReviewers(
- ReviewerState.REVIEWER, null, this, rsrc.getProjectState(), getVisibility(rsrc), true));
- }
-
- private VisibilityControl getVisibility(final ProjectResource rsrc) {
- return new VisibilityControl() {
- @Override
- public boolean isVisibleTo(Account.Id account) {
- return permissionBackend
- .absentUser(account)
- .project(rsrc.getNameKey())
- .testOrFalse(ProjectPermission.ACCESS);
- }
- };
- }
-}
