Skip to content

Commit 87a78c8

Browse files
outdooracornjakobw
authored andcommitted
CRUD: Remove "allOf" from 'resources/aliases/requests.js'
Bug: T379912 Change-Id: I7738b174317f59a650d06d6998501eea15953c16
1 parent 0257667 commit 87a78c8

File tree

2 files changed

+53
-75
lines changed

2 files changed

+53
-75
lines changed

repo/domains/crud/specs/resources/aliases/requests.js

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@ const requestParts = require( '../../global/request-parts' );
44

55
module.exports = {
66
"AddAliasesInLanguage": {
7-
"allOf": [
8-
{
9-
"type": "object",
10-
"properties": {
11-
"aliases": {
12-
"type": "array",
13-
"items": { "type": "string" }
14-
}
15-
},
16-
"required": [ "aliases" ]
7+
"type": "object",
8+
"properties": {
9+
"aliases": {
10+
"type": "array",
11+
"items": { "type": "string" }
1712
},
18-
requestParts.MediawikiEdit
19-
]
20-
}
13+
...requestParts.MediawikiEdit.properties
14+
},
15+
"required": [ "aliases" ],
16+
},
2117
};

repo/rest-api/src/openapi.json

Lines changed: 44 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -12059,40 +12059,31 @@
1205912059
"content": {
1206012060
"application/json": {
1206112061
"schema": {
12062-
"allOf": [
12063-
{
12064-
"type": "object",
12065-
"properties": {
12066-
"aliases": {
12067-
"type": "array",
12068-
"items": {
12069-
"type": "string"
12070-
}
12071-
}
12062+
"type": "object",
12063+
"properties": {
12064+
"aliases": {
12065+
"type": "array",
12066+
"items": {
12067+
"type": "string"
12068+
}
12069+
},
12070+
"tags": {
12071+
"type": "array",
12072+
"items": {
12073+
"type": "string"
1207212074
},
12073-
"required": [
12074-
"aliases"
12075-
]
12075+
"default": []
1207612076
},
12077-
{
12078-
"type": "object",
12079-
"properties": {
12080-
"tags": {
12081-
"type": "array",
12082-
"items": {
12083-
"type": "string"
12084-
},
12085-
"default": []
12086-
},
12087-
"bot": {
12088-
"type": "boolean",
12089-
"default": false
12090-
},
12091-
"comment": {
12092-
"type": "string"
12093-
}
12094-
}
12077+
"bot": {
12078+
"type": "boolean",
12079+
"default": false
12080+
},
12081+
"comment": {
12082+
"type": "string"
1209512083
}
12084+
},
12085+
"required": [
12086+
"aliases"
1209612087
]
1209712088
},
1209812089
"example": {
@@ -25946,40 +25937,31 @@
2594625937
"content": {
2594725938
"application/json": {
2594825939
"schema": {
25949-
"allOf": [
25950-
{
25951-
"type": "object",
25952-
"properties": {
25953-
"aliases": {
25954-
"type": "array",
25955-
"items": {
25956-
"type": "string"
25957-
}
25958-
}
25940+
"type": "object",
25941+
"properties": {
25942+
"aliases": {
25943+
"type": "array",
25944+
"items": {
25945+
"type": "string"
25946+
}
25947+
},
25948+
"tags": {
25949+
"type": "array",
25950+
"items": {
25951+
"type": "string"
2595925952
},
25960-
"required": [
25961-
"aliases"
25962-
]
25953+
"default": []
2596325954
},
25964-
{
25965-
"type": "object",
25966-
"properties": {
25967-
"tags": {
25968-
"type": "array",
25969-
"items": {
25970-
"type": "string"
25971-
},
25972-
"default": []
25973-
},
25974-
"bot": {
25975-
"type": "boolean",
25976-
"default": false
25977-
},
25978-
"comment": {
25979-
"type": "string"
25980-
}
25981-
}
25955+
"bot": {
25956+
"type": "boolean",
25957+
"default": false
25958+
},
25959+
"comment": {
25960+
"type": "string"
2598225961
}
25962+
},
25963+
"required": [
25964+
"aliases"
2598325965
]
2598425966
},
2598525967
"example": {

0 commit comments

Comments
 (0)