From 815ddaa5030a72e1d078b7e05ef89630143b08f3 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 14 Dec 2018 15:20:02 -0800 Subject: [PATCH] Remove unused ReviewDb from SuggestReviewers hierarchy Change-Id: I3ca85794b887237add8274008bfba534146d284e --- .../server/restapi/change/SuggestChangeReviewers.java | 4 +--- .../gerrit/server/restapi/change/SuggestReviewers.java | 9 +-------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/java/com/google/gerrit/server/restapi/change/SuggestChangeReviewers.java b/java/com/google/gerrit/server/restapi/change/SuggestChangeReviewers.java index 4a7171638d..f69986f302 100644 --- a/java/com/google/gerrit/server/restapi/change/SuggestChangeReviewers.java +++ b/java/com/google/gerrit/server/restapi/change/SuggestChangeReviewers.java @@ -20,7 +20,6 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.BadRequestException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Account; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.config.GerritServerConfig; @@ -54,13 +53,12 @@ public class SuggestChangeReviewers extends SuggestReviewers @Inject SuggestChangeReviewers( AccountVisibility av, - Provider dbProvider, PermissionBackend permissionBackend, Provider self, @GerritServerConfig Config cfg, ReviewersUtil reviewersUtil, ProjectCache projectCache) { - super(av, dbProvider, cfg, reviewersUtil); + super(av, cfg, reviewersUtil); this.permissionBackend = permissionBackend; this.self = self; this.projectCache = projectCache; diff --git a/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java b/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java index 6e94218d6e..e071c894fe 100644 --- a/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java +++ b/java/com/google/gerrit/server/restapi/change/SuggestReviewers.java @@ -18,13 +18,11 @@ import static com.google.gerrit.server.config.GerritConfigListenerHelper.acceptI import com.google.common.flogger.FluentLogger; import com.google.gerrit.extensions.common.AccountVisibility; -import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.change.ReviewerAdder; import com.google.gerrit.server.config.ConfigKey; import com.google.gerrit.server.config.GerritConfigListener; import com.google.gerrit.server.config.GerritServerConfig; import com.google.inject.Inject; -import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; import org.kohsuke.args4j.Option; @@ -33,7 +31,6 @@ public class SuggestReviewers { private static final int DEFAULT_MAX_SUGGESTED = 10; - protected final Provider dbProvider; protected final ReviewersUtil reviewersUtil; private final boolean suggestAccounts; @@ -83,11 +80,7 @@ public class SuggestReviewers { @Inject public SuggestReviewers( - AccountVisibility av, - Provider dbProvider, - @GerritServerConfig Config cfg, - ReviewersUtil reviewersUtil) { - this.dbProvider = dbProvider; + AccountVisibility av, @GerritServerConfig Config cfg, ReviewersUtil reviewersUtil) { this.reviewersUtil = reviewersUtil; this.maxSuggestedReviewers = cfg.getInt("suggest", "maxSuggestedReviewers", DEFAULT_MAX_SUGGESTED);