Adapt to changed SubmitRuleEvaluator constructor Since I363a8ee04 the constuctor requires an AccountCache. Change-Id: I9343717c5d41b3bface25d896d9ad4ab9b4515b3
diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java index e9e548d..5251488 100644 --- a/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java +++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java
@@ -9,6 +9,7 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountByEmailCache; +import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.change.ChangesCollection; import com.google.gerrit.server.change.GetRelated; import com.google.gerrit.server.change.GetRelated.RelatedInfo; @@ -67,6 +68,9 @@ Provider<PostReview> reviewer; @Inject + AccountCache accountCache; + + @Inject Submit submitter; /** @@ -111,7 +115,7 @@ public boolean isSubmittable(String project, int change) throws OrmException { ChangeData changeData = changeDataFactory.create(db.get(), new Project.NameKey(project), new Change.Id(change)); // For draft reviews, the patchSet must be set to avoid an NPE. - final List<SubmitRecord> cansubmit = new SubmitRuleEvaluator(changeData).setPatchSet(changeData.currentPatchSet()).evaluate(); + final List<SubmitRecord> cansubmit = new SubmitRuleEvaluator(accountCache, changeData).setPatchSet(changeData.currentPatchSet()).evaluate(); log.debug(String.format("Checking if change %d is submitable.", change)); for (SubmitRecord submit : cansubmit) { if (submit.status != SubmitRecord.Status.OK) {