opendev/gerrit
Code Issues Proposed changes

Rebase should use Rebase.Input, not PublishDraftPatchSet.Input

Browse Source 
Change-Id: I0a1beb3289128132df3f0760e747ad6376221d79
(cherry picked from commit 8496ecfa73)
This commit is contained in:
Gustaf Lundh
2015-02-27 16:19:23 +01:00
committed by David Pursehouse
parent 73c0395fe4
commit 9bc16fa6bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java
View File

@@ -74,7 +74,7 @@ public class RebaseChangeEdit implements
} }
@Singleton @Singleton
public static class Rebase implements RestModifyView<ChangeResource, PublishDraftPatchSet.Input> { public static class Rebase implements RestModifyView<ChangeResource, Rebase.Input> {
public static class Input { public static class Input {
} }
@@ -92,7 +92,7 @@ public class RebaseChangeEdit implements
} }
@Override @Override
public Response<?> apply(ChangeResource rsrc, PublishDraftPatchSet.Input in) public Response<?> apply(ChangeResource rsrc, Rebase.Input in)
throws AuthException, ResourceConflictException, IOException, throws AuthException, ResourceConflictException, IOException,
InvalidChangeOperationException, OrmException { InvalidChangeOperationException, OrmException {
Optional<ChangeEdit> edit = editUtil.byChange(rsrc.getChange()); Optional<ChangeEdit> edit = editUtil.byChange(rsrc.getChange());