Skip to content

Commit 2212fc2

Browse files
bkoelmanbkoelman
authored
Merge pull request #1665 from json-api-dotnet/merge-master-into-openapi
Merge master into openapi
2 parents d196e12 + 44c3f71 commit 2212fc2

File tree

16 files changed

+58
-58
lines changed

16 files changed

+58
-58
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"requestBody": {
2121
"description": "An array of mutation operations. For syntax, see the [Atomic Operations documentation](https://jsonapi.org/ext/atomic/).",
2222
"content": {
23-
"application/vnd.api+json; ext=atomic-operations": {
23+
"application/vnd.api+json; ext=atomic": {
2424
"schema": {
2525
"allOf": [
2626
{
@@ -36,7 +36,7 @@
3636
"200": {
3737
"description": "All operations were successfully applied, which resulted in additional changes.",
3838
"content": {
39-
"application/vnd.api+json; ext=atomic-operations": {
39+
"application/vnd.api+json; ext=atomic": {
4040
"schema": {
4141
"$ref": "#/components/schemas/operationsResponseDocument"
4242
}
@@ -49,7 +49,7 @@
4949
"400": {
5050
"description": "The request body is missing or malformed.",
5151
"content": {
52-
"application/vnd.api+json; ext=atomic-operations": {
52+
"application/vnd.api+json; ext=atomic": {
5353
"schema": {
5454
"$ref": "#/components/schemas/errorResponseDocument"
5555
}
@@ -59,7 +59,7 @@
5959
"403": {
6060
"description": "An operation is not accessible or a client-generated ID is used.",
6161
"content": {
62-
"application/vnd.api+json; ext=atomic-operations": {
62+
"application/vnd.api+json; ext=atomic": {
6363
"schema": {
6464
"$ref": "#/components/schemas/errorResponseDocument"
6565
}
@@ -69,7 +69,7 @@
6969
"404": {
7070
"description": "A resource or a related resource does not exist.",
7171
"content": {
72-
"application/vnd.api+json; ext=atomic-operations": {
72+
"application/vnd.api+json; ext=atomic": {
7373
"schema": {
7474
"$ref": "#/components/schemas/errorResponseDocument"
7575
}
@@ -79,7 +79,7 @@
7979
"409": {
8080
"description": "The request body contains conflicting information or another resource with the same ID already exists.",
8181
"content": {
82-
"application/vnd.api+json; ext=atomic-operations": {
82+
"application/vnd.api+json; ext=atomic": {
8383
"schema": {
8484
"$ref": "#/components/schemas/errorResponseDocument"
8585
}
@@ -89,7 +89,7 @@
8989
"422": {
9090
"description": "Validation of the request body failed.",
9191
"content": {
92-
"application/vnd.api+json; ext=atomic-operations": {
92+
"application/vnd.api+json; ext=atomic": {
9393
"schema": {
9494
"$ref": "#/components/schemas/errorResponseDocument"
9595
}

‎src/Examples/OpenApiKiotaClientExample/GeneratedCode/Api/Operations/OperationsRequestBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public RequestInformation ToPostRequestInformation(global::OpenApiKiotaClientExa
8484
_ = body ?? throw new ArgumentNullException(nameof(body));
8585
var requestInfo = new RequestInformation(Method.POST, UrlTemplate, PathParameters);
8686
requestInfo.Configure(requestConfiguration);
87-
requestInfo.Headers.TryAdd("Accept", "application/vnd.api+json;ext=atomic-operations");
88-
requestInfo.SetContentFromParsable(RequestAdapter, "application/vnd.api+json;ext=atomic-operations", body);
87+
requestInfo.Headers.TryAdd("Accept", "application/vnd.api+json;ext=atomic");
88+
requestInfo.SetContentFromParsable(RequestAdapter, "application/vnd.api+json;ext=atomic", body);
8989
return requestInfo;
9090
}
9191
/// <summary>

‎src/JsonApiDotNetCore/Middleware/HeaderConstants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ public static class HeaderConstants
1414
public const string AtomicOperationsMediaType = $"{MediaType}; ext=\"https://jsonapi.org/ext/atomic\"";
1515

1616
[Obsolete($"Use {nameof(JsonApiMediaType)}.{nameof(JsonApiMediaType.RelaxedAtomicOperations)}.ToString() instead.")]
17-
public const string RelaxedAtomicOperationsMediaType = $"{MediaType}; ext=atomic-operations";
17+
public const string RelaxedAtomicOperationsMediaType = $"{MediaType}; ext=atomic";
1818
}

‎src/JsonApiDotNetCore/Middleware/JsonApiMediaType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public sealed class JsonApiMediaType : IEquatable<JsonApiMediaType>
2525
public static readonly JsonApiMediaType AtomicOperations = new([JsonApiMediaTypeExtension.AtomicOperations]);
2626

2727
/// <summary>
28-
/// Gets the JSON:API media type with the "atomic-operations" extension.
28+
/// Gets the JSON:API media type with the "atomic" extension.
2929
/// </summary>
3030
public static readonly JsonApiMediaType RelaxedAtomicOperations = new([JsonApiMediaTypeExtension.RelaxedAtomicOperations]);
3131

‎src/JsonApiDotNetCore/Middleware/JsonApiMediaTypeExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace JsonApiDotNetCore.Middleware;
99
public sealed class JsonApiMediaTypeExtension : IEquatable<JsonApiMediaTypeExtension>
1010
{
1111
public static readonly JsonApiMediaTypeExtension AtomicOperations = new("https://jsonapi.org/ext/atomic");
12-
public static readonly JsonApiMediaTypeExtension RelaxedAtomicOperations = new("atomic-operations");
12+
public static readonly JsonApiMediaTypeExtension RelaxedAtomicOperations = new("atomic");
1313

1414
public string UnescapedValue { get; }
1515

‎test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public async Task Prefers_JsonApi_with_AtomicOperations_extension_in_Accept_head
121121
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default}; profile=some"));
122122
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(JsonApiMediaType.Default.ToString()));
123123
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default}; unknown=unexpected"));
124-
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default};EXT=atomic-operations; q=0.8"));
124+
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default};EXT=atomic; q=0.8"));
125125
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default};EXT=\"https://jsonapi.org/ext/atomic\"; q=0.2"));
126126
};
127127

@@ -168,7 +168,7 @@ public async Task Prefers_JsonApi_with_relaxed_AtomicOperations_extension_in_Acc
168168
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(JsonApiMediaType.Default.ToString()));
169169
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default}; unknown=unexpected"));
170170
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default};EXT=\"https://jsonapi.org/ext/atomic\"; q=0.8"));
171-
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default};EXT=atomic-operations; q=0.2"));
171+
headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{JsonApiMediaType.Default};EXT=atomic; q=0.2"));
172172
};
173173

174174
// Act

‎test/OpenApiKiotaEndToEndTests/AtomicOperations/GeneratedCode/Operations/OperationsRequestBuilder.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ public RequestInformation ToPostRequestInformation(global::OpenApiKiotaEndToEndT
8484
_ = body ?? throw new ArgumentNullException(nameof(body));
8585
var requestInfo = new RequestInformation(Method.POST, UrlTemplate, PathParameters);
8686
requestInfo.Configure(requestConfiguration);
87-
requestInfo.Headers.TryAdd("Accept", "application/vnd.api+json;ext=atomic-operations");
88-
requestInfo.SetContentFromParsable(RequestAdapter, "application/vnd.api+json;ext=atomic-operations", body);
87+
requestInfo.Headers.TryAdd("Accept", "application/vnd.api+json;ext=atomic");
88+
requestInfo.SetContentFromParsable(RequestAdapter, "application/vnd.api+json;ext=atomic", body);
8989
return requestInfo;
9090
}
9191
/// <summary>

‎test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2996,7 +2996,7 @@
29962996
"requestBody": {
29972997
"description": "An array of mutation operations. For syntax, see the [Atomic Operations documentation](https://jsonapi.org/ext/atomic/).",
29982998
"content": {
2999-
"application/vnd.api+json; ext=atomic-operations": {
2999+
"application/vnd.api+json; ext=atomic": {
30003000
"schema": {
30013001
"allOf": [
30023002
{
@@ -3012,7 +3012,7 @@
30123012
"200": {
30133013
"description": "All operations were successfully applied, which resulted in additional changes.",
30143014
"content": {
3015-
"application/vnd.api+json; ext=atomic-operations": {
3015+
"application/vnd.api+json; ext=atomic": {
30163016
"schema": {
30173017
"$ref": "#/components/schemas/operationsResponseDocument"
30183018
}
@@ -3025,7 +3025,7 @@
30253025
"400": {
30263026
"description": "The request body is missing or malformed.",
30273027
"content": {
3028-
"application/vnd.api+json; ext=atomic-operations": {
3028+
"application/vnd.api+json; ext=atomic": {
30293029
"schema": {
30303030
"$ref": "#/components/schemas/errorResponseDocument"
30313031
}
@@ -3035,7 +3035,7 @@
30353035
"403": {
30363036
"description": "An operation is not accessible or a client-generated ID is used.",
30373037
"content": {
3038-
"application/vnd.api+json; ext=atomic-operations": {
3038+
"application/vnd.api+json; ext=atomic": {
30393039
"schema": {
30403040
"$ref": "#/components/schemas/errorResponseDocument"
30413041
}
@@ -3045,7 +3045,7 @@
30453045
"404": {
30463046
"description": "A resource or a related resource does not exist.",
30473047
"content": {
3048-
"application/vnd.api+json; ext=atomic-operations": {
3048+
"application/vnd.api+json; ext=atomic": {
30493049
"schema": {
30503050
"$ref": "#/components/schemas/errorResponseDocument"
30513051
}
@@ -3055,7 +3055,7 @@
30553055
"409": {
30563056
"description": "The request body contains conflicting information or another resource with the same ID already exists.",
30573057
"content": {
3058-
"application/vnd.api+json; ext=atomic-operations": {
3058+
"application/vnd.api+json; ext=atomic": {
30593059
"schema": {
30603060
"$ref": "#/components/schemas/errorResponseDocument"
30613061
}
@@ -3065,7 +3065,7 @@
30653065
"422": {
30663066
"description": "Validation of the request body failed.",
30673067
"content": {
3068-
"application/vnd.api+json; ext=atomic-operations": {
3068+
"application/vnd.api+json; ext=atomic": {
30693069
"schema": {
30703070
"$ref": "#/components/schemas/errorResponseDocument"
30713071
}

‎test/OpenApiTests/AtomicOperations/OperationsTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async Task Operations_endpoint_is_exposed()
4141
"requestBody": {
4242
"description": "An array of mutation operations. For syntax, see the [Atomic Operations documentation](https://jsonapi.org/ext/atomic/).",
4343
"content": {
44-
"application/vnd.api+json; ext=atomic-operations": {
44+
"application/vnd.api+json; ext=atomic": {
4545
"schema": {
4646
"allOf": [
4747
{
@@ -57,7 +57,7 @@ public async Task Operations_endpoint_is_exposed()
5757
"200": {
5858
"description": "All operations were successfully applied, which resulted in additional changes.",
5959
"content": {
60-
"application/vnd.api+json; ext=atomic-operations": {
60+
"application/vnd.api+json; ext=atomic": {
6161
"schema": {
6262
"$ref": "#/components/schemas/operationsResponseDocument"
6363
}
@@ -70,7 +70,7 @@ public async Task Operations_endpoint_is_exposed()
7070
"400": {
7171
"description": "The request body is missing or malformed.",
7272
"content": {
73-
"application/vnd.api+json; ext=atomic-operations": {
73+
"application/vnd.api+json; ext=atomic": {
7474
"schema": {
7575
"$ref": "#/components/schemas/errorResponseDocument"
7676
}
@@ -80,7 +80,7 @@ public async Task Operations_endpoint_is_exposed()
8080
"403": {
8181
"description": "An operation is not accessible or a client-generated ID is used.",
8282
"content": {
83-
"application/vnd.api+json; ext=atomic-operations": {
83+
"application/vnd.api+json; ext=atomic": {
8484
"schema": {
8585
"$ref": "#/components/schemas/errorResponseDocument"
8686
}
@@ -90,7 +90,7 @@ public async Task Operations_endpoint_is_exposed()
9090
"404": {
9191
"description": "A resource or a related resource does not exist.",
9292
"content": {
93-
"application/vnd.api+json; ext=atomic-operations": {
93+
"application/vnd.api+json; ext=atomic": {
9494
"schema": {
9595
"$ref": "#/components/schemas/errorResponseDocument"
9696
}
@@ -100,7 +100,7 @@ public async Task Operations_endpoint_is_exposed()
100100
"409": {
101101
"description": "The request body contains conflicting information or another resource with the same ID already exists.",
102102
"content": {
103-
"application/vnd.api+json; ext=atomic-operations": {
103+
"application/vnd.api+json; ext=atomic": {
104104
"schema": {
105105
"$ref": "#/components/schemas/errorResponseDocument"
106106
}
@@ -110,7 +110,7 @@ public async Task Operations_endpoint_is_exposed()
110110
"422": {
111111
"description": "Validation of the request body failed.",
112112
"content": {
113-
"application/vnd.api+json; ext=atomic-operations": {
113+
"application/vnd.api+json; ext=atomic": {
114114
"schema": {
115115
"$ref": "#/components/schemas/errorResponseDocument"
116116
}

‎test/OpenApiTests/Documentation/ErrorResponseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace OpenApiTests.Documentation;
88
public sealed class ErrorResponseTests : IClassFixture<OpenApiTestContext<DocumentationStartup<DocumentationDbContext>, DocumentationDbContext>>
99
{
1010
private const string EscapedJsonApiMediaType = "['application/vnd.api+json']";
11-
private const string EscapedOperationsMediaType = "['application/vnd.api+json; ext=atomic-operations']";
11+
private const string EscapedOperationsMediaType = "['application/vnd.api+json; ext=atomic']";
1212

1313
private readonly OpenApiTestContext<DocumentationStartup<DocumentationDbContext>, DocumentationDbContext> _testContext;
1414

‎test/OpenApiTests/NamingConventions/CamelCase/CamelCaseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,10 +566,10 @@ public async Task Casing_convention_is_applied_to_PostOperations_endpoint()
566566
operationElement.Should().Be("postOperations");
567567
});
568568

569-
getElement.Should().ContainPath("requestBody.content['application/vnd.api+json; ext=atomic-operations'].schema.allOf[0].$ref")
569+
getElement.Should().ContainPath("requestBody.content['application/vnd.api+json; ext=atomic'].schema.allOf[0].$ref")
570570
.ShouldBeSchemaReferenceId("operationsRequestDocument");
571571

572-
getElement.Should().ContainPath("responses.200.content['application/vnd.api+json; ext=atomic-operations'].schema.$ref")
572+
getElement.Should().ContainPath("responses.200.content['application/vnd.api+json; ext=atomic'].schema.$ref")
573573
.ShouldBeSchemaReferenceId("operationsResponseDocument");
574574
});
575575

‎test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"requestBody": {
2121
"description": "An array of mutation operations. For syntax, see the [Atomic Operations documentation](https://jsonapi.org/ext/atomic/).",
2222
"content": {
23-
"application/vnd.api+json; ext=atomic-operations": {
23+
"application/vnd.api+json; ext=atomic": {
2424
"schema": {
2525
"allOf": [
2626
{
@@ -36,7 +36,7 @@
3636
"200": {
3737
"description": "All operations were successfully applied, which resulted in additional changes.",
3838
"content": {
39-
"application/vnd.api+json; ext=atomic-operations": {
39+
"application/vnd.api+json; ext=atomic": {
4040
"schema": {
4141
"$ref": "#/components/schemas/operationsResponseDocument"
4242
}
@@ -49,7 +49,7 @@
4949
"400": {
5050
"description": "The request body is missing or malformed.",
5151
"content": {
52-
"application/vnd.api+json; ext=atomic-operations": {
52+
"application/vnd.api+json; ext=atomic": {
5353
"schema": {
5454
"$ref": "#/components/schemas/errorResponseDocument"
5555
}
@@ -59,7 +59,7 @@
5959
"403": {
6060
"description": "An operation is not accessible or a client-generated ID is used.",
6161
"content": {
62-
"application/vnd.api+json; ext=atomic-operations": {
62+
"application/vnd.api+json; ext=atomic": {
6363
"schema": {
6464
"$ref": "#/components/schemas/errorResponseDocument"
6565
}
@@ -69,7 +69,7 @@
6969
"404": {
7070
"description": "A resource or a related resource does not exist.",
7171
"content": {
72-
"application/vnd.api+json; ext=atomic-operations": {
72+
"application/vnd.api+json; ext=atomic": {
7373
"schema": {
7474
"$ref": "#/components/schemas/errorResponseDocument"
7575
}
@@ -79,7 +79,7 @@
7979
"409": {
8080
"description": "The request body contains conflicting information or another resource with the same ID already exists.",
8181
"content": {
82-
"application/vnd.api+json; ext=atomic-operations": {
82+
"application/vnd.api+json; ext=atomic": {
8383
"schema": {
8484
"$ref": "#/components/schemas/errorResponseDocument"
8585
}
@@ -89,7 +89,7 @@
8989
"422": {
9090
"description": "Validation of the request body failed.",
9191
"content": {
92-
"application/vnd.api+json; ext=atomic-operations": {
92+
"application/vnd.api+json; ext=atomic": {
9393
"schema": {
9494
"$ref": "#/components/schemas/errorResponseDocument"
9595
}

0 commit comments

Comments
 (0)