opendev/gerrit
Code Issues Proposed changes

Remove kind attribute from REST containers

Browse Source 
It seems like new REST endpoints don't include "kind" attribute. This
change removes it from the code and documentation.

Change-Id: Ia73fb92ce01461e7de140b138fc72583b00170bc
This commit is contained in:
David Ostrovsky 2014-05-29 22:23:41 +02:00 committed by David Ostrovsky
parent 7af3ec348e
commit 631c963931
20 changed files with 0 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/rest-api-accounts.txt
View File

@ -753,7 +753,6 @@ entries is returned.
)]}'
[
{
"kind": "gerritcodereview#group",
"id": "global%3AAnonymous-Users",
"url": "#/admin/groups/uuid-global%3AAnonymous-Users",
"options": {
@ -763,7 +762,6 @@ entries is returned.
"owner_id": "6a1e70e1a88782771a91808c8af9bbb7a9871389"
},
{
"kind": "gerritcodereview#group",
"id": "834ec36dd5e0ed21a2ff5d7e2255da082d63bbd7",
"url": "#/admin/groups/uuid-834ec36dd5e0ed21a2ff5d7e2255da082d63bbd7",
"options": {
@ -773,7 +771,6 @@ entries is returned.
"owner_id": "834ec36dd5e0ed21a2ff5d7e2255da082d63bbd7"
},
{
"kind": "gerritcodereview#group",
"id": "global%3ARegistered-Users",
"url": "#/admin/groups/uuid-global%3ARegistered-Users",
"options": {
@ -948,7 +945,6 @@ link:rest-api-changes.html#change-info[ChangeInfo] entities.
)]}'
[
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",

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

@ -43,7 +43,6 @@ the resulting change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9941",
"project": "myProject",
"branch": "master",
@ -94,7 +93,6 @@ Query for open changes of watched projects:
)]}'
[
{
"kind": "gerritcodereview#change",
"id": "demo~master~Idaf5e098d70898b7119f6f4af5a6c13343d64b57",
"project": "demo",
"branch": "master",
@ -113,7 +111,6 @@ Query for open changes of watched projects:
},
},
{
"kind": "gerritcodereview#change",
"id": "demo~master~I09c8041b5867d5b33170316e2abc34b79bbb8501",
"project": "demo",
"branch": "master",
@ -169,7 +166,6 @@ Query that retrieves changes for a user's dashboard:
[
[
{
"kind": "gerritcodereview#change",
"id": "demo~master~Idaf5e098d70898b7119f6f4af5a6c13343d64b57",
"project": "demo",
"branch": "master",
@ -318,7 +314,6 @@ default. Optional fields are:
)]}'
[
{
"kind": "gerritcodereview#change",
"id": "demo~master~I7ea46d2e2ee5c64c0d807677859cfb7d90b8966a",
"project": "gerrit",
"branch": "master",
@ -455,7 +450,6 @@ describes the change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -506,7 +500,6 @@ describes the change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -757,7 +750,6 @@ describes the abandoned change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -817,7 +809,6 @@ describes the restored change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -875,7 +866,6 @@ is included.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I3ea943139cb62e86071996f2480e58bf3eeb9dd2",
"project": "myProject",
"branch": "master",
@ -968,7 +958,6 @@ describes the reverting change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -1034,7 +1023,6 @@ describes the submitted/merged change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -1124,7 +1112,6 @@ an link:#included-in-info[IncludedInInfo] entity is returned.
)]}'
{
"kind": "gerritcodereview#includedininfo",
"branches": [
"master"
],
@ -1159,7 +1146,6 @@ As result a list of link:#reviewer-info[ReviewerInfo] entries is returned.
)]}'
[
{
"kind": "gerritcodereview#reviewer",
"approvals": {
"Verified": "+1",
"Code-Review": "+2"
@ -1169,7 +1155,6 @@ As result a list of link:#reviewer-info[ReviewerInfo] entries is returned.
"email": "john.doe@example.com"
},
{
"kind": "gerritcodereview#reviewer",
"approvals": {
"Verified": " 0",
"Code-Review": "-1"
@ -1206,7 +1191,6 @@ As result a list of link:#suggested-reviewer-info[SuggestedReviewerInfo] entries
)]}'
[
{
"kind": "gerritcodereview#suggestedreviewer",
"account": {
"_account_id": 1000097,
"name": "Jane Roe",
@ -1214,7 +1198,6 @@ As result a list of link:#suggested-reviewer-info[SuggestedReviewerInfo] entries
}
},
{
"kind": "gerritcodereview#suggestedreviewer",
"group": {
"id": "4fd581c0657268f2bdcc26699fbf9ddb76e3a279",
"name": "Joiner"
@ -1247,7 +1230,6 @@ describes the reviewer.
)]}'
{
"kind": "gerritcodereview#reviewer",
"approvals": {
"Verified": "+1",
"Code-Review": "+2"
@ -1292,7 +1274,6 @@ returned that describes the newly added reviewers.
{
"reviewers": [
{
"kind": "gerritcodereview#reviewer",
"approvals": {
"Verified": " 0",
"Code-Review": " 0"
@ -1394,7 +1375,6 @@ describes the revision.
)]}'
{
"kind": "gerritcodereview#commit",
"parents": [
{
"commit": "1eee2c9d8f352483781e772f35dc586a69ff5646",
@ -1449,7 +1429,6 @@ for the current patch set.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9940",
"project": "myProject",
"branch": "master",
@ -1632,7 +1611,6 @@ is included.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I3ea943139cb62e86071996f2480e58bf3eeb9dd2",
"project": "myProject",
"branch": "master",
@ -2002,14 +1980,12 @@ sorted by file path.
{
"gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java": [
{
"kind": "gerritcodereview#comment",
"id": "TvcXrmjM",
"line": 23,
"message": "[nit] trailing whitespace",
"updated": "2013-02-26 15:40:43.986000000"
},
{
"kind": "gerritcodereview#comment",
"id": "TveXwFiA",
"line": 49,
"in_reply_to": "TfYX-Iuo",
@ -2054,7 +2030,6 @@ describes the draft comment.
)]}'
{
"kind": "gerritcodereview#comment",
"id": "TvcXrmjM",
"path": "gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java",
"line": 23,
@ -2088,7 +2063,6 @@ describes the draft comment.
)]}'
{
"kind": "gerritcodereview#comment",
"id": "TvcXrmjM",
"path": "gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java",
"line": 23,
@ -2131,7 +2105,6 @@ describes the draft comment.
)]}'
{
"kind": "gerritcodereview#comment",
"id": "TvcXrmjM",
"path": "gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java",
"line": 23,
@ -2185,7 +2158,6 @@ sorted by file path.
{
"gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java": [
{
"kind": "gerritcodereview#comment",
"id": "TvcXrmjM",
"line": 23,
"message": "[nit] trailing whitespace",
@ -2197,7 +2169,6 @@ sorted by file path.
}
},
{
"kind": "gerritcodereview#comment",
"id": "TveXwFiA",
"line": 49,
"in_reply_to": "TfYX-Iuo",
@ -2237,7 +2208,6 @@ describes the published comment.
)]}'
{
"kind": "gerritcodereview#comment",
"id": "TvcXrmjM",
"path": "gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java",
"line": 23,
@ -2577,7 +2547,6 @@ describes the resulting cherry picked change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9941",
"project": "myProject",
"branch": "release-branch",
@ -2629,7 +2598,6 @@ describes the change.
)]}'
{
"kind": "gerritcodereview#change",
"id": "myProject~master~I8473b95934b5732ac55d26311a706c9c2bde9941",
"project": "myProject",
"branch": "release-branch",
@ -2793,7 +2761,6 @@ The `ChangeInfo` entity contains information about a change.
[options="header",width="50%",cols="1,^1,5"]
|==================================
|Field Name ||Description
|`kind` ||`gerritcodereview#change`
|`id` ||
The ID of the change in the format "'<project>\~<branch>~<Change-Id>'",
where 'project', 'branch' and 'Change-Id' are URL encoded. For 'branch' the
@ -2906,7 +2873,6 @@ The `CommentInfo` entity contains information about an inline comment.
[options="header",width="50%",cols="1,^1,5"]
|===========================
|Field Name ||Description
|`kind` ||`gerritcodereview#comment`
|`id` ||The URL encoded UUID of the comment.
|`path` |optional|
The path of the file for which the inline comment was done. +
@ -2942,8 +2908,6 @@ comment.
[options="header",width="50%",cols="1,^1,5"]
|===========================
|Field Name ||Description
|`kind` |optional|
Must be `gerritcodereview#comment` if provided.
|`id` |optional|
The URL encoded UUID of the comment if an existing draft comment should
be updated.
@ -3302,7 +3266,6 @@ In addition `ReviewerInfo` has the following fields:
[options="header",width="50%",cols="1,6"]
|==========================
|Field Name |Description
|`kind` |`gerritcodereview#reviewer`
|`approvals` |
The approvals of the reviewer as a map that maps the label names to the
approval values ("`-2`", "`-1`", " `0`", "`+1`", "`+2`").
@ -3479,7 +3442,6 @@ change was merged into and tags it was tagged with.
[options="header",width="50%",cols="1,6"]
|==========================
|Field Name |Description
|`kind` |`gerritcodereview#includedininfo`
|`branches` | The list of branches this change was merged into.
Each branch is listed without the 'refs/head/' prefix.
|`tags` | The list of tags this change was tagged with.

17
Documentation/rest-api-config.txt
View File

@ -312,82 +312,66 @@ The entries in the map are sorted by capability ID.
)]}'
{
"accessDatabase": {
"kind": "gerritcodereview#capability",
"id": "accessDatabase",
"name": "Access Database"
},
"administrateServer": {
"kind": "gerritcodereview#capability",
"id": "administrateServer",
"name": "Administrate Server"
},
"createAccount": {
"kind": "gerritcodereview#capability",
"id": "createAccount",
"name": "Create Account"
},
"createGroup": {
"kind": "gerritcodereview#capability",
"id": "createGroup",
"name": "Create Group"
},
"createProject": {
"kind": "gerritcodereview#capability",
"id": "createProject",
"name": "Create Project"
},
"emailReviewers": {
"kind": "gerritcodereview#capability",
"id": "emailReviewers",
"name": "Email Reviewers"
},
"flushCaches": {
"kind": "gerritcodereview#capability",
"id": "flushCaches",
"name": "Flush Caches"
},
"killTask": {
"kind": "gerritcodereview#capability",
"id": "killTask",
"name": "Kill Task"
},
"priority": {
"kind": "gerritcodereview#capability",
"id": "priority",
"name": "Priority"
},
"queryLimit": {
"kind": "gerritcodereview#capability",
"id": "queryLimit",
"name": "Query Limit"
},
"runGC": {
"kind": "gerritcodereview#capability",
"id": "runGC",
"name": "Run Garbage Collection"
},
"streamEvents": {
"kind": "gerritcodereview#capability",
"id": "streamEvents",
"name": "Stream Events"
},
"viewCaches": {
"kind": "gerritcodereview#capability",
"id": "viewCaches",
"name": "View Caches"
},
"viewConnections": {
"kind": "gerritcodereview#capability",
"id": "viewConnections",
"name": "View Connections"
},
"viewPlugins": {
"kind": "gerritcodereview#capability",
"id": "viewPlugins",
"name": "View Plugins"
},
"viewQueue": {
"kind": "gerritcodereview#capability",
"id": "viewQueue",
"name": "View Queue"
}
@ -480,7 +464,6 @@ The `CapabilityInfo` entity contains information about a capability.
[options="header",width="50%",cols="1,6"]
|=================================
|Field Name |Description
|`kind` |`gerritcodereview#capability`
|`id` |capability ID
|`name` |capability name
|=================================

18
Documentation/rest-api-groups.txt
View File

@ -35,7 +35,6 @@ by group name.
)]}'
{
"Administrators": {
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
"options": {
@ -46,7 +45,6 @@ by group name.
"owner_id": "6a1e70e1a88782771a91808c8af9bbb7a9871389"
},
"Anonymous Users": {
"kind": "gerritcodereview#group",
"id": "global%3AAnonymous-Users",
"url": "#/admin/groups/uuid-global%3AAnonymous-Users",
"options": {
@ -57,7 +55,6 @@ by group name.
"owner_id": "6a1e70e1a88782771a91808c8af9bbb7a9871389"
},
"MyProject_Committers": {
"kind": "gerritcodereview#group",
"id": "834ec36dd5e0ed21a2ff5d7e2255da082d63bbd7",
"url": "#/admin/groups/uuid-834ec36dd5e0ed21a2ff5d7e2255da082d63bbd7",
"options": {
@ -68,7 +65,6 @@ by group name.
"owner_id": "834ec36dd5e0ed21a2ff5d7e2255da082d63bbd7"
},
"Non-Interactive Users": {
"kind": "gerritcodereview#group",
"id": "5057f3cbd3519d6ab69364429a89ffdffba50f73",
"url": "#/admin/groups/uuid-5057f3cbd3519d6ab69364429a89ffdffba50f73",
"options": {
@ -79,7 +75,6 @@ by group name.
"owner_id": "6a1e70e1a88782771a91808c8af9bbb7a9871389"
},
"Project Owners": {
"kind": "gerritcodereview#group",
"id": "global%3AProject-Owners",
"url": "#/admin/groups/uuid-global%3AProject-Owners",
"options": {
@ -90,7 +85,6 @@ by group name.
"owner_id": "6a1e70e1a88782771a91808c8af9bbb7a9871389"
},
"Registered Users": {
"kind": "gerritcodereview#group",
"id": "global%3ARegistered-Users",
"url": "#/admin/groups/uuid-global%3ARegistered-Users",
"options": {
@ -147,7 +141,6 @@ returned.
)]}'
{
"MyProject-Committers": {
"kind": "gerritcodereview#group",
"id": "9999c971bb4ab872aab759d8c49833ee6b9ff320",
"url": "#/admin/groups/uuid-9999c971bb4ab872aab759d8c49833ee6b9ff320",
"options": {
@ -203,7 +196,6 @@ describes the group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"name": "Administrators",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
@ -251,7 +243,6 @@ describes the created group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "9999c971bb4ab872aab759d8c49833ee6b9ff320",
"name": "MyProject-Committers",
"url": "#/admin/groups/uuid-9999c971bb4ab872aab759d8c49833ee6b9ff320",
@ -293,7 +284,6 @@ describes the group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"name": "Administrators",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
@ -544,7 +534,6 @@ describes the owner group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"name": "Administrators",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
@ -591,7 +580,6 @@ describes the new owner group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"name": "Administrators",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
@ -892,7 +880,6 @@ The entries in the list are sorted by group name and UUID.
)]}'
[
{
"kind": "gerritcodereview#group",
"id": "7ca042f4d5847936fcb90ca91057673157fd06fc",
"name": "MyProject-Verifiers",
"url": "#/admin/groups/uuid-7ca042f4d5847936fcb90ca91057673157fd06fc",
@ -929,7 +916,6 @@ describes the included group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "7ca042f4d5847936fcb90ca91057673157fd06fc",
"name": "MyProject-Verifiers",
"url": "#/admin/groups/uuid-7ca042f4d5847936fcb90ca91057673157fd06fc",
@ -966,7 +952,6 @@ describes the included group.
)]}'
{
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"name": "MyGroup",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
@ -1027,7 +1012,6 @@ group was already included in the group.
)]}'
[
{
"kind": "gerritcodereview#group",
"id": "6a1e70e1a88782771a91808c8af9bbb7a9871389",
"name": "MyGroup",
"url": "#/admin/groups/uuid-6a1e70e1a88782771a91808c8af9bbb7a9871389",
@ -1038,7 +1022,6 @@ group was already included in the group.
"owner_id": "6a1e70e1a88782771a91808c8af9bbb7a9871389"
},
{
"kind": "gerritcodereview#group",
"id": "5057f3cbd3519d6ab69364429a89ffdffba50f73",
"name": "MyOtherGroup",
"url": "#/admin/groups/uuid-5057f3cbd3519d6ab69364429a89ffdffba50f73",
@ -1133,7 +1116,6 @@ a Gerrit internal group, or an external group that is known to Gerrit.
[options="header",width="50%",cols="1,^1,5"]
|===========================
|Field Name ||Description
|`kind` ||`gerritcodereview#group`
|`id` ||The URL encoded UUID of the group.
|`name` |
not set if returned in a map where the group name is used as map key|

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

@ -45,13 +45,11 @@ by plugin ID.
)]}'
{
"delete-project": {
"kind": "gerritcodereview#plugin",
"id": "delete-project",
"index_url": "plugins/delete-project/",
"version": "2.9-SNAPSHOT"
},
"reviewers-by-blame": {
"kind": "gerritcodereview#plugin",
"id": "reviewers-by-blame",
"index_url": "plugins/reviewers-by-blame/",
"version": "2.9-SNAPSHOT",
@ -103,7 +101,6 @@ describes the plugin.
)]}'
{
"kind": "gerritcodereview#plugin",
"id": "delete-project",
"version": "2.8"
}
@ -135,7 +132,6 @@ describes the plugin.
)]}'
{
"kind": "gerritcodereview#plugin",
"id": "delete-project",
"version": "2.8"
}
@ -165,7 +161,6 @@ describes the plugin.
)]}'
{
"kind": "gerritcodereview#plugin",
"id": "delete-project",
"version": "2.8"
}
@ -201,7 +196,6 @@ describes the plugin.
)]}'
{
"kind": "gerritcodereview#plugin",
"id": "delete-project",
"version": "2.8",
"disabled": true
@ -232,7 +226,6 @@ describes the plugin.
)]}'
{
"kind": "gerritcodereview#plugin",
"id": "delete-project",
"version": "2.8",
"disabled": true
@ -257,7 +250,6 @@ The `PluginInfo` entity describes a plugin.
[options="header",width="50%",cols="1,^2,4"]
|=======================
|Field Name ||Description
|`kind` ||`gerritcodereview#plugin`
|`id` ||The ID of the plugin.
|`version` ||The version of the plugin.
|`index_url`|optional|URL of the plugin's default page.

7
Documentation/rest-api-projects.txt
View File

@ -439,7 +439,6 @@ read access to `refs/meta/config`.
)]}'
{
"kind": "gerritcodereview#project_config",
"description": "demo project",
"use_contributor_agreements": {
"value": true,
@ -528,7 +527,6 @@ ConfigInfo] entity.
)]}'
{
"kind": "gerritcodereview#project_config",
"use_contributor_agreements": {
"value": false,
"configured_value": "FALSE",
@ -925,7 +923,6 @@ List all dashboards for the `work/my-project` project:
)]}'
[
{
"kind": "gerritcodereview#dashboard",
"id": "main:closed",
"ref": "main",
"path": "closed",
@ -977,7 +974,6 @@ that describes the dashboard.
)]}'
{
"kind": "gerritcodereview#dashboard",
"id": "main:closed",
"ref": "main",
"path": "closed",
@ -1014,7 +1010,6 @@ dashboard-id.
)]}'
{
"kind": "gerritcodereview#dashboard",
"id": "main:closed",
"ref": "main",
"path": "closed",
@ -1070,7 +1065,6 @@ link:#dashboard-info[DashboardInfo] entity.
)]}'
{
"kind": "gerritcodereview#dashboard",
"id": "main:closed",
"ref": "main",
"path": "closed",
@ -1331,7 +1325,6 @@ dashboard.
[options="header",width="50%",cols="1,^2,4"]
|===============================
|Field Name ||Description
|`kind` ||`gerritcodereview#dashboard`
|`id` ||
The ID of the dashboard. The ID has the format '<ref>:<path>',
where ref and path are URL encoded.

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ReviewInput.java
View File

@ -61,7 +61,6 @@ public class ReviewInput extends JavaScriptObject {
var l=m[p];
for (var i=0;i<l.length;i++) {
var c=l[i];
delete c['kind'];
delete c['path'];
delete c['updated'];
}

2
gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java
View File

@ -99,8 +99,6 @@ public class GetPreferences implements RestReadView<AccountResource> {
}
public static class PreferenceInfo {
final String kind = "gerritcodereview#preferences";
Short changesPerPage;
Boolean showSiteHeader;
Boolean useFlashClipboard;

1
gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
View File

@ -919,7 +919,6 @@ public class ChangeJson {
}
public static class ChangeInfo {
public final String kind = "gerritcodereview#change";
public String id;
public String project;
public String branch;

2
gerrit-server/src/main/java/com/google/gerrit/server/change/CommentInfo.java
View File

@ -24,8 +24,6 @@ import com.google.gerrit.server.account.AccountInfo;
import java.sql.Timestamp;
public class CommentInfo {
final String kind = "gerritcodereview#comment";
String id;
String path;
Side side;

1
gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java
View File

@ -79,7 +79,6 @@ class IncludedIn implements RestReadView<ChangeResource> {
}
static class IncludedInInfo {
String kind = "gerritcodereview#includedininfo";
Collection<String> branches;
Collection<String> tags;

3
gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraft.java
View File

@ -37,7 +37,6 @@ import java.util.Collections;
@Singleton
class PutDraft implements RestModifyView<DraftResource, Input> {
static class Input {
String kind;
String id;
String path;
Side side;
@ -65,8 +64,6 @@ class PutDraft implements RestModifyView<DraftResource, Input> {
PatchLineComment c = rsrc.getComment();
if (in == null || in.message == null || in.message.trim().isEmpty()) {
return delete.get().apply(rsrc, null);
} else if (in.kind != null && !"gerritcodereview#comment".equals(in.kind)) {
throw new BadRequestException("expected kind gerritcodereview#comment");
} else if (in.id != null && !rsrc.getId().equals(in.id)) {
throw new BadRequestException("id must match URL");
} else if (in.line != null && in.line < 0) {

1
gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
View File

@ -132,7 +132,6 @@ public class ReviewerJson {
}
public static class ReviewerInfo extends AccountInfo {
final String kind = "gerritcodereview#reviewer";
Map<String, String> approvals;
protected ReviewerInfo(Account.Id id) {

1
gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java
View File

@ -269,7 +269,6 @@ public class SuggestReviewers implements RestReadView<ChangeResource> {
}
public static class SuggestedReviewerInfo implements Comparable<SuggestedReviewerInfo> {
String kind = "gerritcodereview#suggestedreviewer";
public AccountInfo account;
public GroupBaseInfo group;

1
gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java
View File

@ -86,7 +86,6 @@ public class ListCapabilities implements RestReadView<ConfigResource> {
}
public static class CapabilityInfo {
final String kind = "gerritcodereview#capability";
public String id;
public String name;

1
gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java
View File

@ -127,7 +127,6 @@ public class GroupJson {
}
public static class GroupInfo extends GroupBaseInfo {
final String kind = "gerritcodereview#group";
public String url;
public GroupOptionsInfo options;

1
gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java
View File

@ -127,7 +127,6 @@ public class ListPlugins implements RestReadView<TopLevelResource> {
}
static class PluginInfo {
final String kind = "gerritcodereview#plugin";
String id;
String version;
String indexUrl;

2
gerrit-server/src/main/java/com/google/gerrit/server/project/ConfigInfo.java
View File

@ -39,8 +39,6 @@ import java.util.Map;
import java.util.TreeMap;
public class ConfigInfo {
public final String kind = "gerritcodereview#project_config";
public String description;
public InheritedBooleanInfo useContributorAgreements;
public InheritedBooleanInfo useContentMerge;

1
gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java
View File

@ -205,7 +205,6 @@ class DashboardsCollection implements
}
static class DashboardInfo {
final String kind = "gerritcodereview#dashboard";
String id;
String project;
String definingProject;

1
gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java
View File

@ -205,7 +205,6 @@ public class CommentsTest {
private static void assertComment(PatchLineComment plc, CommentInfo ci) {
assertEquals(plc.getKey().get(), ci.id);
assertEquals(plc.getParentUuid(), ci.inReplyTo);
assertEquals("gerritcodereview#comment", ci.kind);
assertEquals(plc.getMessage(), ci.message);
assertNotNull(ci.author);
assertEquals(plc.getAuthor(), ci.author._id);