Skip to content

Commit e193759

Browse files
bkoelmanbkoelman
committed
Add missing meta in resource identifier objects, add missing meta in request resource objects, move meta in response resource objects to abstract base schema
1 parent a0aec70 commit e193759

File tree

127 files changed

+2657
-813
lines changed

Some content is hidden

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

127 files changed

+2657
-813
lines changed

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

Lines changed: 91 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5433,6 +5433,13 @@
54335433
"$ref": "#/components/schemas/relationshipsInCreatePersonRequest"
54345434
}
54355435
]
5436+
},
5437+
"meta": {
5438+
"allOf": [
5439+
{
5440+
"$ref": "#/components/schemas/meta"
5441+
}
5442+
]
54365443
}
54375444
},
54385445
"additionalProperties": false
@@ -5467,6 +5474,13 @@
54675474
"$ref": "#/components/schemas/relationshipsInCreateTagRequest"
54685475
}
54695476
]
5477+
},
5478+
"meta": {
5479+
"allOf": [
5480+
{
5481+
"$ref": "#/components/schemas/meta"
5482+
}
5483+
]
54705484
}
54715485
},
54725486
"additionalProperties": false
@@ -5501,6 +5515,13 @@
55015515
"$ref": "#/components/schemas/relationshipsInCreateTodoItemRequest"
55025516
}
55035517
]
5518+
},
5519+
"meta": {
5520+
"allOf": [
5521+
{
5522+
"$ref": "#/components/schemas/meta"
5523+
}
5524+
]
55045525
}
55055526
},
55065527
"additionalProperties": false
@@ -5514,6 +5535,13 @@
55145535
"type": {
55155536
"minLength": 1,
55165537
"type": "string"
5538+
},
5539+
"meta": {
5540+
"allOf": [
5541+
{
5542+
"$ref": "#/components/schemas/meta"
5543+
}
5544+
]
55175545
}
55185546
},
55195547
"additionalProperties": false,
@@ -5562,6 +5590,13 @@
55625590
"$ref": "#/components/schemas/relationshipsInUpdatePersonRequest"
55635591
}
55645592
]
5593+
},
5594+
"meta": {
5595+
"allOf": [
5596+
{
5597+
"$ref": "#/components/schemas/meta"
5598+
}
5599+
]
55655600
}
55665601
},
55675602
"additionalProperties": false
@@ -5601,6 +5636,13 @@
56015636
"$ref": "#/components/schemas/relationshipsInUpdateTagRequest"
56025637
}
56035638
]
5639+
},
5640+
"meta": {
5641+
"allOf": [
5642+
{
5643+
"$ref": "#/components/schemas/meta"
5644+
}
5645+
]
56045646
}
56055647
},
56065648
"additionalProperties": false
@@ -5640,6 +5682,13 @@
56405682
"$ref": "#/components/schemas/relationshipsInUpdateTodoItemRequest"
56415683
}
56425684
]
5685+
},
5686+
"meta": {
5687+
"allOf": [
5688+
{
5689+
"$ref": "#/components/schemas/meta"
5690+
}
5691+
]
56435692
}
56445693
},
56455694
"additionalProperties": false
@@ -6165,13 +6214,6 @@
61656214
"$ref": "#/components/schemas/resourceLinks"
61666215
}
61676216
]
6168-
},
6169-
"meta": {
6170-
"allOf": [
6171-
{
6172-
"$ref": "#/components/schemas/meta"
6173-
}
6174-
]
61756217
}
61766218
},
61776219
"additionalProperties": false
@@ -6200,6 +6242,13 @@
62006242
"lid": {
62016243
"minLength": 1,
62026244
"type": "string"
6245+
},
6246+
"meta": {
6247+
"allOf": [
6248+
{
6249+
"$ref": "#/components/schemas/meta"
6250+
}
6251+
]
62036252
}
62046253
},
62056254
"additionalProperties": false
@@ -6222,6 +6271,13 @@
62226271
"minLength": 1,
62236272
"type": "string",
62246273
"format": "int64"
6274+
},
6275+
"meta": {
6276+
"allOf": [
6277+
{
6278+
"$ref": "#/components/schemas/meta"
6279+
}
6280+
]
62256281
}
62266282
},
62276283
"additionalProperties": false
@@ -6862,13 +6918,6 @@
68626918
"$ref": "#/components/schemas/resourceLinks"
68636919
}
68646920
]
6865-
},
6866-
"meta": {
6867-
"allOf": [
6868-
{
6869-
"$ref": "#/components/schemas/meta"
6870-
}
6871-
]
68726921
}
68736922
},
68746923
"additionalProperties": false
@@ -6927,6 +6976,13 @@
69276976
"lid": {
69286977
"minLength": 1,
69296978
"type": "string"
6979+
},
6980+
"meta": {
6981+
"allOf": [
6982+
{
6983+
"$ref": "#/components/schemas/meta"
6984+
}
6985+
]
69306986
}
69316987
},
69326988
"additionalProperties": false
@@ -6949,6 +7005,13 @@
69497005
"minLength": 1,
69507006
"type": "string",
69517007
"format": "int64"
7008+
},
7009+
"meta": {
7010+
"allOf": [
7011+
{
7012+
"$ref": "#/components/schemas/meta"
7013+
}
7014+
]
69527015
}
69537016
},
69547017
"additionalProperties": false
@@ -7314,13 +7377,6 @@
73147377
"$ref": "#/components/schemas/resourceLinks"
73157378
}
73167379
]
7317-
},
7318-
"meta": {
7319-
"allOf": [
7320-
{
7321-
"$ref": "#/components/schemas/meta"
7322-
}
7323-
]
73247380
}
73257381
},
73267382
"additionalProperties": false
@@ -7379,6 +7435,13 @@
73797435
"lid": {
73807436
"minLength": 1,
73817437
"type": "string"
7438+
},
7439+
"meta": {
7440+
"allOf": [
7441+
{
7442+
"$ref": "#/components/schemas/meta"
7443+
}
7444+
]
73827445
}
73837446
},
73847447
"additionalProperties": false
@@ -7401,6 +7464,13 @@
74017464
"minLength": 1,
74027465
"type": "string",
74037466
"format": "int64"
7467+
},
7468+
"meta": {
7469+
"allOf": [
7470+
{
7471+
"$ref": "#/components/schemas/meta"
7472+
}
7473+
]
74047474
}
74057475
},
74067476
"additionalProperties": false

‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/DataInCreatePersonRequest.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ public string Lid
4646
get { return BackingStore?.Get<string>("lid"); }
4747
set { BackingStore?.Set("lid", value); }
4848
}
49+
#endif
50+
/// <summary>The meta property</summary>
51+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
52+
#nullable enable
53+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta? Meta
54+
{
55+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta?>("meta"); }
56+
set { BackingStore?.Set("meta", value); }
57+
}
58+
#nullable restore
59+
#else
60+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta Meta
61+
{
62+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta"); }
63+
set { BackingStore?.Set("meta", value); }
64+
}
4965
#endif
5066
/// <summary>The relationships property</summary>
5167
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -96,6 +112,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
96112
{
97113
{ "attributes", n => { Attributes = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreatePersonRequest>(global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreatePersonRequest.CreateFromDiscriminatorValue); } },
98114
{ "lid", n => { Lid = n.GetStringValue(); } },
115+
{ "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>(global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
99116
{ "relationships", n => { Relationships = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreatePersonRequest>(global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreatePersonRequest.CreateFromDiscriminatorValue); } },
100117
{ "type", n => { Type = n.GetEnumValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.PersonResourceType>(); } },
101118
};
@@ -109,6 +126,7 @@ public virtual void Serialize(ISerializationWriter writer)
109126
_ = writer ?? throw new ArgumentNullException(nameof(writer));
110127
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreatePersonRequest>("attributes", Attributes);
111128
writer.WriteStringValue("lid", Lid);
129+
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta", Meta);
112130
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreatePersonRequest>("relationships", Relationships);
113131
writer.WriteEnumValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.PersonResourceType>("type", Type);
114132
}

‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/DataInCreateTagRequest.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ public string Lid
4646
get { return BackingStore?.Get<string>("lid"); }
4747
set { BackingStore?.Set("lid", value); }
4848
}
49+
#endif
50+
/// <summary>The meta property</summary>
51+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
52+
#nullable enable
53+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta? Meta
54+
{
55+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta?>("meta"); }
56+
set { BackingStore?.Set("meta", value); }
57+
}
58+
#nullable restore
59+
#else
60+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta Meta
61+
{
62+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta"); }
63+
set { BackingStore?.Set("meta", value); }
64+
}
4965
#endif
5066
/// <summary>The relationships property</summary>
5167
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -96,6 +112,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
96112
{
97113
{ "attributes", n => { Attributes = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreateTagRequest>(global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreateTagRequest.CreateFromDiscriminatorValue); } },
98114
{ "lid", n => { Lid = n.GetStringValue(); } },
115+
{ "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>(global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
99116
{ "relationships", n => { Relationships = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreateTagRequest>(global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreateTagRequest.CreateFromDiscriminatorValue); } },
100117
{ "type", n => { Type = n.GetEnumValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.TagResourceType>(); } },
101118
};
@@ -109,6 +126,7 @@ public virtual void Serialize(ISerializationWriter writer)
109126
_ = writer ?? throw new ArgumentNullException(nameof(writer));
110127
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreateTagRequest>("attributes", Attributes);
111128
writer.WriteStringValue("lid", Lid);
129+
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta", Meta);
112130
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreateTagRequest>("relationships", Relationships);
113131
writer.WriteEnumValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.TagResourceType>("type", Type);
114132
}

‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/DataInCreateTodoItemRequest.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@ public string Lid
4646
get { return BackingStore?.Get<string>("lid"); }
4747
set { BackingStore?.Set("lid", value); }
4848
}
49+
#endif
50+
/// <summary>The meta property</summary>
51+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
52+
#nullable enable
53+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta? Meta
54+
{
55+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta?>("meta"); }
56+
set { BackingStore?.Set("meta", value); }
57+
}
58+
#nullable restore
59+
#else
60+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta Meta
61+
{
62+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta"); }
63+
set { BackingStore?.Set("meta", value); }
64+
}
4965
#endif
5066
/// <summary>The relationships property</summary>
5167
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
@@ -96,6 +112,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
96112
{
97113
{ "attributes", n => { Attributes = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreateTodoItemRequest>(global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreateTodoItemRequest.CreateFromDiscriminatorValue); } },
98114
{ "lid", n => { Lid = n.GetStringValue(); } },
115+
{ "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>(global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
99116
{ "relationships", n => { Relationships = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreateTodoItemRequest>(global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreateTodoItemRequest.CreateFromDiscriminatorValue); } },
100117
{ "type", n => { Type = n.GetEnumValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.TodoItemResourceType>(); } },
101118
};
@@ -109,6 +126,7 @@ public virtual void Serialize(ISerializationWriter writer)
109126
_ = writer ?? throw new ArgumentNullException(nameof(writer));
110127
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.AttributesInCreateTodoItemRequest>("attributes", Attributes);
111128
writer.WriteStringValue("lid", Lid);
129+
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta", Meta);
112130
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.RelationshipsInCreateTodoItemRequest>("relationships", Relationships);
113131
writer.WriteEnumValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.TodoItemResourceType>("type", Type);
114132
}

‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Models/DataInResponse.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,22 @@ public partial class DataInResponse : IBackedModel, IParsable
1515
{
1616
/// <summary>Stores model information.</summary>
1717
public IBackingStore BackingStore { get; private set; }
18+
/// <summary>The meta property</summary>
19+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
20+
#nullable enable
21+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta? Meta
22+
{
23+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta?>("meta"); }
24+
set { BackingStore?.Set("meta", value); }
25+
}
26+
#nullable restore
27+
#else
28+
public global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta Meta
29+
{
30+
get { return BackingStore?.Get<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta"); }
31+
set { BackingStore?.Set("meta", value); }
32+
}
33+
#endif
1834
/// <summary>The type property</summary>
1935
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
2036
#nullable enable
@@ -63,6 +79,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
6379
{
6480
return new Dictionary<string, Action<IParseNode>>
6581
{
82+
{ "meta", n => { Meta = n.GetObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>(global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta.CreateFromDiscriminatorValue); } },
6683
{ "type", n => { Type = n.GetStringValue(); } },
6784
};
6885
}
@@ -73,6 +90,7 @@ public virtual IDictionary<string, Action<IParseNode>> GetFieldDeserializers()
7390
public virtual void Serialize(ISerializationWriter writer)
7491
{
7592
_ = writer ?? throw new ArgumentNullException(nameof(writer));
93+
writer.WriteObjectValue<global::OpenApiKiotaClientExample.GeneratedCode.Models.Meta>("meta", Meta);
7694
writer.WriteStringValue("type", Type);
7795
}
7896
}

0 commit comments

Comments
 (0)