Skip to content

Commit 09338e1

Browse files
verdie-gverdie-g
committed
Address PR comments
1 parent 1a8cc52 commit 09338e1

File tree

15 files changed

+334
-643
lines changed

15 files changed

+334
-643
lines changed

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

Lines changed: 36 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
"in": "header",
3737
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
3838
"schema": {
39-
"type": "string",
40-
"nullable": true
39+
"type": "string"
4140
}
4241
}
4342
],
@@ -111,8 +110,7 @@
111110
"in": "header",
112111
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
113112
"schema": {
114-
"type": "string",
115-
"nullable": true
113+
"type": "string"
116114
}
117115
}
118116
],
@@ -290,8 +288,7 @@
290288
"in": "header",
291289
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
292290
"schema": {
293-
"type": "string",
294-
"nullable": true
291+
"type": "string"
295292
}
296293
}
297294
],
@@ -384,8 +381,7 @@
384381
"in": "header",
385382
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
386383
"schema": {
387-
"type": "string",
388-
"nullable": true
384+
"type": "string"
389385
}
390386
}
391387
],
@@ -598,8 +594,7 @@
598594
"in": "header",
599595
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
600596
"schema": {
601-
"type": "string",
602-
"nullable": true
597+
"type": "string"
603598
}
604599
}
605600
],
@@ -692,8 +687,7 @@
692687
"in": "header",
693688
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
694689
"schema": {
695-
"type": "string",
696-
"nullable": true
690+
"type": "string"
697691
}
698692
}
699693
],
@@ -773,8 +767,7 @@
773767
"in": "header",
774768
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
775769
"schema": {
776-
"type": "string",
777-
"nullable": true
770+
"type": "string"
778771
}
779772
}
780773
],
@@ -867,8 +860,7 @@
867860
"in": "header",
868861
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
869862
"schema": {
870-
"type": "string",
871-
"nullable": true
863+
"type": "string"
872864
}
873865
}
874866
],
@@ -1149,8 +1141,7 @@
11491141
"in": "header",
11501142
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
11511143
"schema": {
1152-
"type": "string",
1153-
"nullable": true
1144+
"type": "string"
11541145
}
11551146
}
11561147
],
@@ -1243,8 +1234,7 @@
12431234
"in": "header",
12441235
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
12451236
"schema": {
1246-
"type": "string",
1247-
"nullable": true
1237+
"type": "string"
12481238
}
12491239
}
12501240
],
@@ -1324,8 +1314,7 @@
13241314
"in": "header",
13251315
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
13261316
"schema": {
1327-
"type": "string",
1328-
"nullable": true
1317+
"type": "string"
13291318
}
13301319
}
13311320
],
@@ -1418,8 +1407,7 @@
14181407
"in": "header",
14191408
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
14201409
"schema": {
1421-
"type": "string",
1422-
"nullable": true
1410+
"type": "string"
14231411
}
14241412
}
14251413
],
@@ -1691,8 +1679,7 @@
16911679
"in": "header",
16921680
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
16931681
"schema": {
1694-
"type": "string",
1695-
"nullable": true
1682+
"type": "string"
16961683
}
16971684
}
16981685
],
@@ -1766,8 +1753,7 @@
17661753
"in": "header",
17671754
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
17681755
"schema": {
1769-
"type": "string",
1770-
"nullable": true
1756+
"type": "string"
17711757
}
17721758
}
17731759
],
@@ -1945,8 +1931,7 @@
19451931
"in": "header",
19461932
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
19471933
"schema": {
1948-
"type": "string",
1949-
"nullable": true
1934+
"type": "string"
19501935
}
19511936
}
19521937
],
@@ -2039,8 +2024,7 @@
20392024
"in": "header",
20402025
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
20412026
"schema": {
2042-
"type": "string",
2043-
"nullable": true
2027+
"type": "string"
20442028
}
20452029
}
20462030
],
@@ -2253,8 +2237,7 @@
22532237
"in": "header",
22542238
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
22552239
"schema": {
2256-
"type": "string",
2257-
"nullable": true
2240+
"type": "string"
22582241
}
22592242
}
22602243
],
@@ -2347,8 +2330,7 @@
23472330
"in": "header",
23482331
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
23492332
"schema": {
2350-
"type": "string",
2351-
"nullable": true
2333+
"type": "string"
23522334
}
23532335
}
23542336
],
@@ -2428,8 +2410,7 @@
24282410
"in": "header",
24292411
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
24302412
"schema": {
2431-
"type": "string",
2432-
"nullable": true
2413+
"type": "string"
24332414
}
24342415
}
24352416
],
@@ -2522,8 +2503,7 @@
25222503
"in": "header",
25232504
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
25242505
"schema": {
2525-
"type": "string",
2526-
"nullable": true
2506+
"type": "string"
25272507
}
25282508
}
25292509
],
@@ -2795,8 +2775,7 @@
27952775
"in": "header",
27962776
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
27972777
"schema": {
2798-
"type": "string",
2799-
"nullable": true
2778+
"type": "string"
28002779
}
28012780
}
28022781
],
@@ -2870,8 +2849,7 @@
28702849
"in": "header",
28712850
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
28722851
"schema": {
2873-
"type": "string",
2874-
"nullable": true
2852+
"type": "string"
28752853
}
28762854
}
28772855
],
@@ -3049,8 +3027,7 @@
30493027
"in": "header",
30503028
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
30513029
"schema": {
3052-
"type": "string",
3053-
"nullable": true
3030+
"type": "string"
30543031
}
30553032
}
30563033
],
@@ -3143,8 +3120,7 @@
31433120
"in": "header",
31443121
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
31453122
"schema": {
3146-
"type": "string",
3147-
"nullable": true
3123+
"type": "string"
31483124
}
31493125
}
31503126
],
@@ -3357,8 +3333,7 @@
33573333
"in": "header",
33583334
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
33593335
"schema": {
3360-
"type": "string",
3361-
"nullable": true
3336+
"type": "string"
33623337
}
33633338
}
33643339
],
@@ -3451,8 +3426,7 @@
34513426
"in": "header",
34523427
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
34533428
"schema": {
3454-
"type": "string",
3455-
"nullable": true
3429+
"type": "string"
34563430
}
34573431
}
34583432
],
@@ -3532,8 +3506,7 @@
35323506
"in": "header",
35333507
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
35343508
"schema": {
3535-
"type": "string",
3536-
"nullable": true
3509+
"type": "string"
35373510
}
35383511
}
35393512
],
@@ -3626,8 +3599,7 @@
36263599
"in": "header",
36273600
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
36283601
"schema": {
3629-
"type": "string",
3630-
"nullable": true
3602+
"type": "string"
36313603
}
36323604
}
36333605
],
@@ -3774,8 +3746,7 @@
37743746
"in": "header",
37753747
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
37763748
"schema": {
3777-
"type": "string",
3778-
"nullable": true
3749+
"type": "string"
37793750
}
37803751
}
37813752
],
@@ -3868,8 +3839,7 @@
38683839
"in": "header",
38693840
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
38703841
"schema": {
3871-
"type": "string",
3872-
"nullable": true
3842+
"type": "string"
38733843
}
38743844
}
38753845
],
@@ -3949,8 +3919,7 @@
39493919
"in": "header",
39503920
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
39513921
"schema": {
3952-
"type": "string",
3953-
"nullable": true
3922+
"type": "string"
39543923
}
39553924
}
39563925
],
@@ -4043,8 +4012,7 @@
40434012
"in": "header",
40444013
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
40454014
"schema": {
4046-
"type": "string",
4047-
"nullable": true
4015+
"type": "string"
40484016
}
40494017
}
40504018
],
@@ -4191,8 +4159,7 @@
41914159
"in": "header",
41924160
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
41934161
"schema": {
4194-
"type": "string",
4195-
"nullable": true
4162+
"type": "string"
41964163
}
41974164
}
41984165
],
@@ -4285,8 +4252,7 @@
42854252
"in": "header",
42864253
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
42874254
"schema": {
4288-
"type": "string",
4289-
"nullable": true
4255+
"type": "string"
42904256
}
42914257
}
42924258
],
@@ -4366,8 +4332,7 @@
43664332
"in": "header",
43674333
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
43684334
"schema": {
4369-
"type": "string",
4370-
"nullable": true
4335+
"type": "string"
43714336
}
43724337
}
43734338
],
@@ -4460,8 +4425,7 @@
44604425
"in": "header",
44614426
"description": "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
44624427
"schema": {
4463-
"type": "string",
4464-
"nullable": true
4428+
"type": "string"
44654429
}
44664430
}
44674431
],

‎src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiOperationDocumentationFilter.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,8 +563,7 @@ private static void AddRequestHeaderIfNoneMatch(OpenApiOperation operation)
563563
Description = "A list of ETags, resulting in HTTP status 304 without a body, if one of them matches the current fingerprint.",
564564
Schema = new OpenApiSchema
565565
{
566-
Type = "string",
567-
Nullable = true
566+
Type = "string"
568567
}
569568
});
570569
}

0 commit comments

Comments
 (0)