commit a4581164c75b3c889358836f2e1ae23e098d5540
author Khai Do <zaro0508@gmail.com> Mon Mar 07 16:33:18 2016 -0800
committer Khai Do <zaro0508@gmail.com> Mon Mar 07 16:33:18 2016 -0800
tree c70346b74fea20aa8c88527c8c0edce69587e570
parent f1f78fddee50fde8da1dc20480dc40ccf65db090

Bring up to date with Gerrit master

Fixed build failures against current Gerrit master.

src/main/java/com/googlesource/gerrit/plugins/ci/commands/VerifyCommand.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/ci/commands/VerifyCommand.java b/src/main/java/com/googlesource/gerrit/plugins/ci/commands/VerifyCommand.java
index 9b680ac..690cde8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/ci/commands/VerifyCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/ci/commands/VerifyCommand.java
@@ -30,7 +30,7 @@
 import com.google.gerrit.server.project.ProjectControl;
 import com.google.gerrit.sshd.CommandMetaData;
 import com.google.gerrit.sshd.SshCommand;
-import com.google.gerrit.sshd.commands.CommandUtils;
+import com.google.gerrit.sshd.commands.PatchSetParser;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 
@@ -60,7 +60,7 @@
       usage = "list of commits or patch sets to verify")
   void addPatchSetId(String token) {
     try {
-      PatchSet ps = CommandUtils.parsePatchSet(token, db, projectControl,
+      PatchSet ps = psParser.parsePatchSet(token, projectControl,
           branch);
       patchSets.add(ps);
     } catch (UnloggedFailure e) {
@@ -118,6 +118,9 @@
   @Inject
   private ChangeControl.GenericFactory genericFactory;
 
+  @Inject
+  private PatchSetParser psParser;
+
   private Map<String, VerificationInfo> jobResult = Maps.newHashMap();
 
   @Override
@@ -142,7 +145,7 @@
       throws RestApiException, NoSuchChangeException, OrmException,
       IOException {
     ChangeControl ctl =
-        genericFactory.controlFor(patchSet.getId().getParentKey(),
+        genericFactory.validateFor(db, patchSet.getId().getParentKey(),
             currentUser);
     ChangeResource changeResource = new ChangeResource(ctl);
     RevisionResource revResource = new RevisionResource(changeResource,
@@ -157,7 +160,7 @@
       applyVerification(patchSet, verify);
     } catch (RestApiException | NoSuchChangeException | OrmException
         | IOException e) {
-      throw CommandUtils.error(e.getMessage());
+      throw PatchSetParser.error(e.getMessage());
     }
   }