Skip to content

Commit 9a90ef8

Browse files
bkoelmanbkoelman
committed
Extract meta into component schema, allow any type as dictionary value (not only object)
1 parent 9f8f761 commit 9a90ef8

File tree

252 files changed

+2249
-7997
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+2249
-7997
lines changed

‎src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json‎

Lines changed: 111 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -5139,9 +5139,11 @@
51395139
"nullable": true
51405140
},
51415141
"meta": {
5142-
"type": "object",
5143-
"additionalProperties": { },
5144-
"nullable": true
5142+
"allOf": [
5143+
{
5144+
"$ref": "#/components/schemas/meta"
5145+
}
5146+
]
51455147
}
51465148
},
51475149
"additionalProperties": false
@@ -5167,11 +5169,11 @@
51675169
}
51685170
},
51695171
"meta": {
5170-
"type": "object",
5171-
"additionalProperties": {
5172-
"type": "object",
5173-
"nullable": true
5174-
}
5172+
"allOf": [
5173+
{
5174+
"$ref": "#/components/schemas/meta"
5175+
}
5176+
]
51755177
}
51765178
},
51775179
"additionalProperties": false
@@ -5206,6 +5208,12 @@
52065208
},
52075209
"additionalProperties": false
52085210
},
5211+
"meta": {
5212+
"type": "object",
5213+
"additionalProperties": {
5214+
"nullable": true
5215+
}
5216+
},
52095217
"nullablePersonIdentifierResponseDocument": {
52105218
"required": [
52115219
"data",
@@ -5229,11 +5237,11 @@
52295237
"nullable": true
52305238
},
52315239
"meta": {
5232-
"type": "object",
5233-
"additionalProperties": {
5234-
"type": "object",
5235-
"nullable": true
5236-
}
5240+
"allOf": [
5241+
{
5242+
"$ref": "#/components/schemas/meta"
5243+
}
5244+
]
52375245
}
52385246
},
52395247
"additionalProperties": false
@@ -5267,11 +5275,11 @@
52675275
}
52685276
},
52695277
"meta": {
5270-
"type": "object",
5271-
"additionalProperties": {
5272-
"type": "object",
5273-
"nullable": true
5274-
}
5278+
"allOf": [
5279+
{
5280+
"$ref": "#/components/schemas/meta"
5281+
}
5282+
]
52755283
}
52765284
},
52775285
"additionalProperties": false
@@ -5312,11 +5320,11 @@
53125320
"nullable": true
53135321
},
53145322
"meta": {
5315-
"type": "object",
5316-
"additionalProperties": {
5317-
"type": "object",
5318-
"nullable": true
5319-
}
5323+
"allOf": [
5324+
{
5325+
"$ref": "#/components/schemas/meta"
5326+
}
5327+
]
53205328
}
53215329
},
53225330
"additionalProperties": false
@@ -5365,11 +5373,11 @@
53655373
}
53665374
},
53675375
"meta": {
5368-
"type": "object",
5369-
"additionalProperties": {
5370-
"type": "object",
5371-
"nullable": true
5372-
}
5376+
"allOf": [
5377+
{
5378+
"$ref": "#/components/schemas/meta"
5379+
}
5380+
]
53735381
}
53745382
},
53755383
"additionalProperties": false
@@ -5404,11 +5412,11 @@
54045412
]
54055413
},
54065414
"meta": {
5407-
"type": "object",
5408-
"additionalProperties": {
5409-
"type": "object",
5410-
"nullable": true
5411-
}
5415+
"allOf": [
5416+
{
5417+
"$ref": "#/components/schemas/meta"
5418+
}
5419+
]
54125420
}
54135421
},
54145422
"additionalProperties": false
@@ -5455,11 +5463,11 @@
54555463
]
54565464
},
54575465
"meta": {
5458-
"type": "object",
5459-
"additionalProperties": {
5460-
"type": "object",
5461-
"nullable": true
5462-
}
5466+
"allOf": [
5467+
{
5468+
"$ref": "#/components/schemas/meta"
5469+
}
5470+
]
54635471
}
54645472
},
54655473
"additionalProperties": false
@@ -5492,11 +5500,11 @@
54925500
}
54935501
},
54945502
"meta": {
5495-
"type": "object",
5496-
"additionalProperties": {
5497-
"type": "object",
5498-
"nullable": true
5499-
}
5503+
"allOf": [
5504+
{
5505+
"$ref": "#/components/schemas/meta"
5506+
}
5507+
]
55005508
}
55015509
},
55025510
"additionalProperties": false
@@ -5556,11 +5564,11 @@
55565564
}
55575565
},
55585566
"meta": {
5559-
"type": "object",
5560-
"additionalProperties": {
5561-
"type": "object",
5562-
"nullable": true
5563-
}
5567+
"allOf": [
5568+
{
5569+
"$ref": "#/components/schemas/meta"
5570+
}
5571+
]
55645572
}
55655573
},
55665574
"additionalProperties": false
@@ -5824,11 +5832,11 @@
58245832
}
58255833
},
58265834
"meta": {
5827-
"type": "object",
5828-
"additionalProperties": {
5829-
"type": "object",
5830-
"nullable": true
5831-
}
5835+
"allOf": [
5836+
{
5837+
"$ref": "#/components/schemas/meta"
5838+
}
5839+
]
58325840
}
58335841
},
58345842
"additionalProperties": false
@@ -5863,11 +5871,11 @@
58635871
]
58645872
},
58655873
"meta": {
5866-
"type": "object",
5867-
"additionalProperties": {
5868-
"type": "object",
5869-
"nullable": true
5870-
}
5874+
"allOf": [
5875+
{
5876+
"$ref": "#/components/schemas/meta"
5877+
}
5878+
]
58715879
}
58725880
},
58735881
"additionalProperties": false
@@ -5913,11 +5921,11 @@
59135921
}
59145922
},
59155923
"meta": {
5916-
"type": "object",
5917-
"additionalProperties": {
5918-
"type": "object",
5919-
"nullable": true
5920-
}
5924+
"allOf": [
5925+
{
5926+
"$ref": "#/components/schemas/meta"
5927+
}
5928+
]
59215929
}
59225930
},
59235931
"additionalProperties": false
@@ -5950,11 +5958,11 @@
59505958
}
59515959
},
59525960
"meta": {
5953-
"type": "object",
5954-
"additionalProperties": {
5955-
"type": "object",
5956-
"nullable": true
5957-
}
5961+
"allOf": [
5962+
{
5963+
"$ref": "#/components/schemas/meta"
5964+
}
5965+
]
59585966
}
59595967
},
59605968
"additionalProperties": false
@@ -6011,11 +6019,11 @@
60116019
}
60126020
},
60136021
"meta": {
6014-
"type": "object",
6015-
"additionalProperties": {
6016-
"type": "object",
6017-
"nullable": true
6018-
}
6022+
"allOf": [
6023+
{
6024+
"$ref": "#/components/schemas/meta"
6025+
}
6026+
]
60196027
}
60206028
},
60216029
"additionalProperties": false
@@ -6052,11 +6060,11 @@
60526060
}
60536061
},
60546062
"meta": {
6055-
"type": "object",
6056-
"additionalProperties": {
6057-
"type": "object",
6058-
"nullable": true
6059-
}
6063+
"allOf": [
6064+
{
6065+
"$ref": "#/components/schemas/meta"
6066+
}
6067+
]
60606068
}
60616069
},
60626070
"additionalProperties": false
@@ -6095,11 +6103,11 @@
60956103
]
60966104
},
60976105
"meta": {
6098-
"type": "object",
6099-
"additionalProperties": {
6100-
"type": "object",
6101-
"nullable": true
6102-
}
6106+
"allOf": [
6107+
{
6108+
"$ref": "#/components/schemas/meta"
6109+
}
6110+
]
61036111
}
61046112
},
61056113
"additionalProperties": false
@@ -6161,11 +6169,11 @@
61616169
}
61626170
},
61636171
"meta": {
6164-
"type": "object",
6165-
"additionalProperties": {
6166-
"type": "object",
6167-
"nullable": true
6168-
}
6172+
"allOf": [
6173+
{
6174+
"$ref": "#/components/schemas/meta"
6175+
}
6176+
]
61696177
}
61706178
},
61716179
"additionalProperties": false
@@ -6200,11 +6208,11 @@
62006208
]
62016209
},
62026210
"meta": {
6203-
"type": "object",
6204-
"additionalProperties": {
6205-
"type": "object",
6206-
"nullable": true
6207-
}
6211+
"allOf": [
6212+
{
6213+
"$ref": "#/components/schemas/meta"
6214+
}
6215+
]
62086216
}
62096217
},
62106218
"additionalProperties": false
@@ -6250,11 +6258,11 @@
62506258
}
62516259
},
62526260
"meta": {
6253-
"type": "object",
6254-
"additionalProperties": {
6255-
"type": "object",
6256-
"nullable": true
6257-
}
6261+
"allOf": [
6262+
{
6263+
"$ref": "#/components/schemas/meta"
6264+
}
6265+
]
62586266
}
62596267
},
62606268
"additionalProperties": false
@@ -6287,11 +6295,11 @@
62876295
}
62886296
},
62896297
"meta": {
6290-
"type": "object",
6291-
"additionalProperties": {
6292-
"type": "object",
6293-
"nullable": true
6294-
}
6298+
"allOf": [
6299+
{
6300+
"$ref": "#/components/schemas/meta"
6301+
}
6302+
]
62956303
}
62966304
},
62976305
"additionalProperties": false

0 commit comments

Comments
 (0)