Fix build of work-in-progress plugin The build of this plugin is broken because batch update classes have been moved to a different package. This change adapts this plugin to these modifications. Change-Id: I349567c41994ffa9da7817f37e3c15d52f787ba1
diff --git a/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java b/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java index abb0a96..5e18d9d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java +++ b/src/main/java/com/googlesource/gerrit/plugins/wip/BaseAction.java
@@ -25,11 +25,13 @@ import com.google.gerrit.server.ChangeUtil; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.git.BatchUpdate; -import com.google.gerrit.server.git.UpdateException; import com.google.gerrit.server.index.change.ChangeIndexer; import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gwtorm.server.OrmException; +import com.google.gerrit.server.update.BatchUpdate; +import com.google.gerrit.server.update.BatchUpdateOp; +import com.google.gerrit.server.update.ChangeContext; +import com.google.gerrit.server.update.UpdateException; import com.google.inject.Inject; import com.google.inject.Provider; @@ -65,9 +67,9 @@ db.changes().beginTransaction(changeId); try (BatchUpdate bu = batchUpdateFactory.create( db, change.getProject(), userProvider.get(), TimeUtil.nowTs())) { - bu.addOp(change.getId(), new BatchUpdate.Op() { + bu.addOp(change.getId(), new BatchUpdateOp() { @Override - public boolean updateChange(BatchUpdate.ChangeContext ctx) { + public boolean updateChange(ChangeContext ctx) { Change change = ctx.getChange(); ChangeUpdate update = ctx.getUpdate(psId); if (change.getStatus() == from) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/wip/ReadyForReview.java b/src/main/java/com/googlesource/gerrit/plugins/wip/ReadyForReview.java index 9f852eb..17db46d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/wip/ReadyForReview.java +++ b/src/main/java/com/googlesource/gerrit/plugins/wip/ReadyForReview.java
@@ -27,10 +27,10 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.change.RevisionResource; -import com.google.gerrit.server.git.BatchUpdate; -import com.google.gerrit.server.git.UpdateException; import com.google.gerrit.server.index.change.ChangeIndexer; import com.google.gwtorm.server.OrmException; +import com.google.gerrit.server.update.BatchUpdate; +import com.google.gerrit.server.update.UpdateException; import com.google.inject.Inject; import com.google.inject.Provider;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/wip/SetCommand.java b/src/main/java/com/googlesource/gerrit/plugins/wip/SetCommand.java index 38eaef7..071aa84 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/wip/SetCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/wip/SetCommand.java
@@ -19,9 +19,9 @@ import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.server.change.ChangesCollection; import com.google.gerrit.server.change.RevisionResource; -import com.google.gerrit.server.git.UpdateException; import com.google.gerrit.server.index.change.ChangeIndexer; import com.google.gerrit.server.project.ProjectControl; +import com.google.gerrit.server.update.UpdateException; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.commands.PatchSetParser;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/wip/WorkInProgress.java b/src/main/java/com/googlesource/gerrit/plugins/wip/WorkInProgress.java index 05a3ebf..f4d03ba 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/wip/WorkInProgress.java +++ b/src/main/java/com/googlesource/gerrit/plugins/wip/WorkInProgress.java
@@ -27,9 +27,9 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.change.RevisionResource; -import com.google.gerrit.server.git.BatchUpdate; -import com.google.gerrit.server.git.UpdateException; import com.google.gerrit.server.index.change.ChangeIndexer; +import com.google.gerrit.server.update.BatchUpdate; +import com.google.gerrit.server.update.UpdateException; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import com.google.inject.Provider;