Skip to content

Commit 0709ea4

Browse files
authored
Fix order of JSON:API properties in OAS document (#1362)
1 parent a420db9 commit 0709ea4

File tree

24 files changed

+779
-743
lines changed

24 files changed

+779
-743
lines changed

src/JsonApiDotNetCore.OpenApi/JsonApiObjectPropertyName.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1313
internal sealed class NullableResourceIdentifierResponseDocument<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
1414
where TResource : IIdentifiable
1515
{
16-
[JsonPropertyName("meta")]
17-
public IDictionary<string, object> Meta { get; set; } = null!;
18-
1916
[JsonPropertyName("jsonapi")]
2017
public JsonapiObject Jsonapi { get; set; } = null!;
2118

2219
[Required]
2320
[JsonPropertyName("links")]
2421
public LinksInResourceIdentifierDocument Links { get; set; } = null!;
22+
23+
[JsonPropertyName("meta")]
24+
public IDictionary<string, object> Meta { get; set; } = null!;
2525
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1111
internal sealed class NullableSecondaryResourceResponseDocument<TResource> : NullableSingleData<ResourceObjectInResponse<TResource>>
1212
where TResource : IIdentifiable
1313
{
14-
[JsonPropertyName("meta")]
15-
public IDictionary<string, object> Meta { get; set; } = null!;
16-
1714
[JsonPropertyName("jsonapi")]
1815
public JsonapiObject Jsonapi { get; set; } = null!;
1916

2017
[Required]
2118
[JsonPropertyName("links")]
2219
public LinksInResourceDocument Links { get; set; } = null!;
20+
21+
[JsonPropertyName("meta")]
22+
public IDictionary<string, object> Meta { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1111
internal sealed class PrimaryResourceResponseDocument<TResource> : SingleData<ResourceObjectInResponse<TResource>>
1212
where TResource : IIdentifiable
1313
{
14-
[JsonPropertyName("meta")]
15-
public IDictionary<string, object> Meta { get; set; } = null!;
16-
1714
[JsonPropertyName("jsonapi")]
1815
public JsonapiObject Jsonapi { get; set; } = null!;
1916

2017
[Required]
2118
[JsonPropertyName("links")]
2219
public LinksInResourceDocument Links { get; set; } = null!;
20+
21+
[JsonPropertyName("meta")]
22+
public IDictionary<string, object> Meta { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1111
internal sealed class ResourceCollectionResponseDocument<TResource> : ManyData<ResourceObjectInResponse<TResource>>
1212
where TResource : IIdentifiable
1313
{
14-
[JsonPropertyName("meta")]
15-
public IDictionary<string, object> Meta { get; set; } = null!;
16-
1714
[JsonPropertyName("jsonapi")]
1815
public JsonapiObject Jsonapi { get; set; } = null!;
1916

2017
[Required]
2118
[JsonPropertyName("links")]
2219
public LinksInResourceCollectionDocument Links { get; set; } = null!;
20+
21+
[JsonPropertyName("meta")]
22+
public IDictionary<string, object> Meta { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1111
internal sealed class ResourceIdentifierCollectionResponseDocument<TResource> : ManyData<ResourceIdentifierObject<TResource>>
1212
where TResource : IIdentifiable
1313
{
14-
[JsonPropertyName("meta")]
15-
public IDictionary<string, object> Meta { get; set; } = null!;
16-
1714
[JsonPropertyName("jsonapi")]
1815
public JsonapiObject Jsonapi { get; set; } = null!;
1916

2017
[Required]
2118
[JsonPropertyName("links")]
2219
public LinksInResourceIdentifierCollectionDocument Links { get; set; } = null!;
20+
21+
[JsonPropertyName("meta")]
22+
public IDictionary<string, object> Meta { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1111
internal sealed class ResourceIdentifierResponseDocument<TResource> : SingleData<ResourceIdentifierObject<TResource>>
1212
where TResource : IIdentifiable
1313
{
14-
[JsonPropertyName("meta")]
15-
public IDictionary<string, object> Meta { get; set; } = null!;
16-
1714
[JsonPropertyName("jsonapi")]
1815
public JsonapiObject Jsonapi { get; set; } = null!;
1916

2017
[Required]
2118
[JsonPropertyName("links")]
2219
public LinksInResourceIdentifierDocument Links { get; set; } = null!;
20+
21+
[JsonPropertyName("meta")]
22+
public IDictionary<string, object> Meta { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
1111
internal sealed class SecondaryResourceResponseDocument<TResource> : SingleData<ResourceObjectInResponse<TResource>>
1212
where TResource : IIdentifiable
1313
{
14-
[JsonPropertyName("meta")]
15-
public IDictionary<string, object> Meta { get; set; } = null!;
16-
1714
[JsonPropertyName("jsonapi")]
1815
public JsonapiObject Jsonapi { get; set; } = null!;
1916

2017
[Required]
2118
[JsonPropertyName("links")]
2219
public LinksInResourceDocument Links { get; set; } = null!;
20+
21+
[JsonPropertyName("meta")]
22+
public IDictionary<string, object> Meta { get; set; } = null!;
2323
}

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierCollectionDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ internal sealed class LinksInResourceIdentifierCollectionDocument
1111
[JsonPropertyName("self")]
1212
public string Self { get; set; } = null!;
1313

14-
[JsonPropertyName("describedby")]
15-
public string Describedby { get; set; } = null!;
16-
1714
[Required]
1815
[JsonPropertyName("related")]
1916
public string Related { get; set; } = null!;
2017

18+
[JsonPropertyName("describedby")]
19+
public string Describedby { get; set; } = null!;
20+
2121
[Required]
2222
[JsonPropertyName("first")]
2323
public string First { get; set; } = null!;

src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierDocument.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ internal sealed class LinksInResourceIdentifierDocument
1111
[JsonPropertyName("self")]
1212
public string Self { get; set; } = null!;
1313

14-
[JsonPropertyName("describedby")]
15-
public string Describedby { get; set; } = null!;
16-
1714
[Required]
1815
[JsonPropertyName("related")]
1916
public string Related { get; set; } = null!;
17+
18+
[JsonPropertyName("describedby")]
19+
public string Describedby { get; set; } = null!;
2020
}

0 commit comments

Comments
 (0)