commit 3f982ca19f2bfc540af4232bde4575692f4bc278
author Khai Do <zaro0508@gmail.com> Wed Jul 20 17:23:19 2016 -0700
committer Khai Do <zaro0508@gmail.com> Wed Jul 20 23:02:03 2016 -0700
tree 4d2de5857a849ba8251a4084579e81af23fe972c
parent a6a92ca3b7902ea7f30b973a2cd922353894e618

Update to master

The way to get RevisionResource has changed.  Update to make it work
with master.

Change-Id: I1f4e8185e0bc210f5a014541a14f04cadc1ec5ee

src/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/SaveCommand.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/SaveCommand.java b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/SaveCommand.java
index fc694fb..df6c085 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/SaveCommand.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/verifystatus/commands/SaveCommand.java
@@ -19,14 +19,12 @@
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
+import com.google.gerrit.extensions.restapi.IdString;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.IdentifiedUser;
-import com.google.gerrit.server.change.ChangeResource;
+import com.google.gerrit.server.change.ChangesCollection;
 import com.google.gerrit.server.change.RevisionResource;
-import com.google.gerrit.server.project.ChangeControl;
-import com.google.gerrit.server.project.NoSuchChangeException;
+import com.google.gerrit.server.change.Revisions;
 import com.google.gerrit.server.project.ProjectControl;
 import com.google.gerrit.sshd.CommandMetaData;
 import com.google.gerrit.sshd.SshCommand;
@@ -111,19 +109,16 @@
   }
 
   @Inject
-  private ReviewDb db;
-
-  @Inject
-  private IdentifiedUser currentUser;
-
-  @Inject
   private PostVerification postVerification;
 
   @Inject
-  private ChangeControl.GenericFactory genericFactory;
+  private PatchSetParser psParser;
 
   @Inject
-  private PatchSetParser psParser;
+  private Revisions revisions;
+
+  @Inject
+  private ChangesCollection changes;
 
   private Map<String, VerificationInfo> jobResult = Maps.newHashMap();
 
@@ -146,14 +141,11 @@
   }
 
   private void applyVerification(PatchSet patchSet, VerifyInput verify)
-      throws RestApiException, NoSuchChangeException, OrmException,
+      throws RestApiException, OrmException,
       IOException {
-    ChangeControl ctl =
-        genericFactory.validateFor(db, patchSet.getId().getParentKey(),
-            currentUser);
-    ChangeResource changeResource = new ChangeResource(ctl);
-    RevisionResource revResource = new RevisionResource(changeResource,
-        patchSet);
+    RevisionResource revResource = revisions.parse(
+        changes.parse(patchSet.getId().getParentKey()),
+        IdString.fromUrl(patchSet.getId().getId()));
     postVerification.apply(revResource, verify);
   }
 
@@ -162,7 +154,7 @@
     verify.verifications = jobResult;
     try {
       applyVerification(patchSet, verify);
-    } catch (RestApiException | NoSuchChangeException | OrmException
+    } catch (RestApiException | OrmException
         | IOException e) {
       throw PatchSetParser.error(e.getMessage());
     }