Adapt to removal of RequestContext#getReviewDbProvider
Change-Id: I56b01bf2754a85f4cf5c65e1147c03372c2bb6fe
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewers.java
index ad6e9d5..db676e0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewers.java
@@ -26,10 +26,6 @@
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
import java.util.ArrayList;
import java.util.Set;
@@ -39,7 +35,6 @@
private final ThreadLocalRequestContext tl;
protected final GerritApi gApi;
protected final IdentifiedUser.GenericFactory identifiedUserFactory;
- protected final SchemaFactory<ReviewDb> schemaFactory;
protected final ChangeInfo changeInfo;
private ReviewDb db = null;
@@ -48,12 +43,10 @@
ThreadLocalRequestContext tl,
GerritApi gApi,
IdentifiedUser.GenericFactory identifiedUserFactory,
- SchemaFactory<ReviewDb> schemaFactory,
ChangeInfo changeInfo) {
this.tl = tl;
this.gApi = gApi;
this.identifiedUserFactory = identifiedUserFactory;
- this.schemaFactory = schemaFactory;
this.changeInfo = changeInfo;
}
@@ -69,23 +62,6 @@
public CurrentUser getUser() {
return identifiedUserFactory.create(new Account.Id(changeInfo.owner._accountId));
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return new Provider<ReviewDb>() {
- @Override
- public ReviewDb get() {
- if (db == null) {
- try {
- db = schemaFactory.open();
- } catch (OrmException e) {
- throw new ProvisionException("Cannot open ReviewDb", e);
- }
- }
- return db;
- }
- };
- }
});
try {
addReviewers(getReviewers(), changeInfo);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewersByConfiguration.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewersByConfiguration.java
index a03c035..6d291a4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewersByConfiguration.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/AddReviewersByConfiguration.java
@@ -17,10 +17,8 @@
import com.google.gerrit.extensions.api.GerritApi;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import java.util.Set;
@@ -37,10 +35,9 @@
ThreadLocalRequestContext tl,
GerritApi gApi,
IdentifiedUser.GenericFactory identifiedUserFactory,
- SchemaFactory<ReviewDb> schemaFactory,
@Assisted ChangeInfo changeInfo,
@Assisted Set<Account.Id> reviewers) {
- super(tl, gApi, identifiedUserFactory, schemaFactory, changeInfo);
+ super(tl, gApi, identifiedUserFactory, changeInfo);
this.reviewers = reviewers;
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
index a07b06e..806b4b4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/SuggestProjectReviewers.java
@@ -43,11 +43,10 @@
@Inject
SuggestProjectReviewers(
AccountVisibility av,
- Provider<ReviewDb> dbProvider,
@GerritServerConfig Config cfg,
ReviewersUtil reviewersUtil,
PermissionBackend permissionBackend) {
- super(av, dbProvider, cfg, reviewersUtil);
+ super(av, cfg, reviewersUtil);
this.permissionBackend = permissionBackend;
}
