commit 08496a2a1feadeef8236e6aa288ca0aeae87004f
author David Pursehouse <dpursehouse@collab.net> Wed Jun 21 14:20:45 2017 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Sep 20 09:37:47 2017 +0900
tree 4f9bca3dd0ed801534d231e54966ce869679d88a
parent 7825f0eebc022299c7a0b6a80a790ce16aebfef7

Adapt to changed SubmitRuleEvaluator constructor

Since I363a8ee04 the constuctor requires an AccountCache.

Change-Id: I9343717c5d41b3bface25d896d9ad4ab9b4515b3

src/main/java/com/criteo/gerrit/plugins/automerge/AtomicityHelper.java

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) {