opendev/gerrit
Code Issues Proposed changes

InlineEdit: Rename endpoints from foo_edit to edit:foo

Browse Source 
Change-Id: If1055ca814995b13336df9ee952463acfd05b71f
This commit is contained in:
David Ostrovsky
2014-11-11 22:39:59 +01:00
parent ae36719784
commit 9cbdb205d8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/rest-api-changes.txt
View File

@@ -1300,14 +1300,14 @@ specified file was deleted in the change edit "`204 No Content`" is returned.
[[publish-edit]] [[publish-edit]]
=== Publish Change Edit === Publish Change Edit
-- --
'POST /changes/link:#change-id[\{change-id\}]/publish_edit 'POST /changes/link:#change-id[\{change-id\}]/edit:publish
-- --
Promotes change edit to a regular patch set. Promotes change edit to a regular patch set.
.Request .Request
---- ----
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/publish_edit HTTP/1.0 POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/edit:publish HTTP/1.0
---- ----
As response "`204 No Content`" is returned. As response "`204 No Content`" is returned.
@@ -1320,14 +1320,14 @@ As response "`204 No Content`" is returned.
[[rebase-edit]] [[rebase-edit]]
=== Rebase Change Edit === Rebase Change Edit
-- --
'POST /changes/link:#change-id[\{change-id\}]/rebase_edit 'POST /changes/link:#change-id[\{change-id\}]/edit:rebase
-- --
Rebases change edit on top of latest patch set. Rebases change edit on top of latest patch set.
.Request .Request
---- ----
POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/rebase_edit HTTP/1.0 POST /changes/myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940/edit:rebase HTTP/1.0
---- ----
When change was rebased on top of latest patch set, response When change was rebased on top of latest patch set, response

4
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
View File

@@ -553,13 +553,13 @@ public class ChangeEditIT extends AbstractDaemonTest {
private String urlPublish() { private String urlPublish() {
return "/changes/" return "/changes/"
+ change.getChangeId() + change.getChangeId()
+ "/publish_edit"; + "/edit:publish";
} }
private String urlRebase() { private String urlRebase() {
return "/changes/" return "/changes/"
+ change.getChangeId() + change.getChangeId()
+ "/rebase_edit"; + "/edit:rebase";
} }
private EditInfo toEditInfo(boolean files) throws IOException { private EditInfo toEditInfo(boolean files) throws IOException {

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeApi.java
View File

@@ -186,13 +186,13 @@ public class ChangeApi {
/** Publish change edit. */ /** Publish change edit. */
public static void publishEdit(int id, AsyncCallback<JavaScriptObject> cb) { public static void publishEdit(int id, AsyncCallback<JavaScriptObject> cb) {
JavaScriptObject in = JavaScriptObject.createObject(); JavaScriptObject in = JavaScriptObject.createObject();
change(id).view("publish_edit").post(in, cb); change(id).view("edit:publish").post(in, cb);
} }
/** Rebase change edit on latest patch set. */ /** Rebase change edit on latest patch set. */
public static void rebaseEdit(int id, AsyncCallback<JavaScriptObject> cb) { public static void rebaseEdit(int id, AsyncCallback<JavaScriptObject> cb) {
JavaScriptObject in = JavaScriptObject.createObject(); JavaScriptObject in = JavaScriptObject.createObject();
change(id).view("rebase_edit").post(in, cb); change(id).view("edit:rebase").post(in, cb);
} }
/** Rebase a revision onto the branch tip. */ /** Rebase a revision onto the branch tip. */

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

@@ -105,8 +105,8 @@ public class Module extends RestApiModule {
child(CHANGE_KIND, "edit").to(ChangeEdits.class); child(CHANGE_KIND, "edit").to(ChangeEdits.class);
delete(CHANGE_KIND, "edit").to(DeleteChangeEdit.class); delete(CHANGE_KIND, "edit").to(DeleteChangeEdit.class);
child(CHANGE_KIND, "publish_edit").to(PublishChangeEdit.class); child(CHANGE_KIND, "edit:publish").to(PublishChangeEdit.class);
child(CHANGE_KIND, "rebase_edit").to(RebaseChangeEdit.class); child(CHANGE_KIND, "edit:rebase").to(RebaseChangeEdit.class);
put(CHANGE_EDIT_KIND, "/").to(ChangeEdits.Put.class); put(CHANGE_EDIT_KIND, "/").to(ChangeEdits.Put.class);
delete(CHANGE_EDIT_KIND).to(ChangeEdits.DeleteContent.class); delete(CHANGE_EDIT_KIND).to(ChangeEdits.DeleteContent.class);
get(CHANGE_EDIT_KIND, "/").to(ChangeEdits.Get.class); get(CHANGE_EDIT_KIND, "/").to(ChangeEdits.Get.class);