Skip to content

Commit d8553d6

Browse files
authored
fix: rename OpenApiDocument.SecurityRequirements as Security
Rename `OpenApiDocument.SecurityRequirements` as `Security`. Fixes #2155
1 parent 64b1c36 commit d8553d6

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void RegisterComponents()
7373
/// <summary>
7474
/// A declaration of which security mechanisms can be used across the API.
7575
/// </summary>
76-
public IList<OpenApiSecurityRequirement>? SecurityRequirements { get; set; } =
76+
public IList<OpenApiSecurityRequirement>? Security { get; set; } =
7777
new List<OpenApiSecurityRequirement>();
7878

7979
private HashSet<OpenApiTag>? _tags;
@@ -139,7 +139,7 @@ public OpenApiDocument(OpenApiDocument? document)
139139
Paths = document?.Paths != null ? new(document?.Paths) : new OpenApiPaths();
140140
Webhooks = document?.Webhooks != null ? new Dictionary<string, IOpenApiPathItem>(document.Webhooks) : null;
141141
Components = document?.Components != null ? new(document?.Components) : null;
142-
SecurityRequirements = document?.SecurityRequirements != null ? new List<OpenApiSecurityRequirement>(document.SecurityRequirements) : null;
142+
Security = document?.Security != null ? new List<OpenApiSecurityRequirement>(document.Security) : null;
143143
Tags = document?.Tags != null ? new HashSet<OpenApiTag>(document.Tags, OpenApiTagComparer.Instance) : null;
144144
ExternalDocs = document?.ExternalDocs != null ? new(document?.ExternalDocs) : null;
145145
Extensions = document?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(document.Extensions) : null;
@@ -223,7 +223,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
223223
// security
224224
writer.WriteOptionalCollection(
225225
OpenApiConstants.Security,
226-
SecurityRequirements,
226+
Security,
227227
callback);
228228

229229
// tags
@@ -361,7 +361,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
361361
// security
362362
writer.WriteOptionalCollection(
363363
OpenApiConstants.Security,
364-
SecurityRequirements,
364+
Security,
365365
(w, s) => s.SerializeAsV2(w));
366366

367367
// tags

src/Microsoft.OpenApi/Reader/V2/OpenApiDocumentDeserializer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ internal static partial class OpenApiV2Deserializer
103103
o.Components.SecuritySchemes = n.CreateMap(LoadSecurityScheme, o);
104104
}
105105
},
106-
{"security", (o, n, _) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement, o)},
106+
{"security", (o, n, _) => o.Security = n.CreateList(LoadSecurityRequirement, o)},
107107
{"tags", (o, n, _) => { if (n.CreateList(LoadTag, o) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
108108
{"externalDocs", (o, n, _) => o.ExternalDocs = LoadExternalDocs(n, o)}
109109
};

src/Microsoft.OpenApi/Reader/V3/OpenApiDocumentDeserializer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal static partial class OpenApiV3Deserializer
2929
{"components", (o, n, _) => o.Components = LoadComponents(n, o)},
3030
{"tags", (o, n, _) => { if (n.CreateList(LoadTag, o) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
3131
{"externalDocs", (o, n, _) => o.ExternalDocs = LoadExternalDocs(n, o)},
32-
{"security", (o, n, _) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement, o)}
32+
{"security", (o, n, _) => o.Security = n.CreateList(LoadSecurityRequirement, o)}
3333
};
3434

3535
private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new PatternFieldMap<OpenApiDocument>

src/Microsoft.OpenApi/Reader/V31/OpenApiDocumentDeserializer.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ internal static partial class OpenApiV31Deserializer
2727
{"components", (o, n, _) => o.Components = LoadComponents(n, o)},
2828
{"tags", (o, n, _) => { if (n.CreateList(LoadTag, o) is {Count:> 0} tags) {o.Tags = new HashSet<OpenApiTag>(tags, OpenApiTagComparer.Instance); } } },
2929
{"externalDocs", (o, n, _) => o.ExternalDocs = LoadExternalDocs(n, o)},
30-
{"security", (o, n, _) => o.SecurityRequirements = n.CreateList(LoadSecurityRequirement, o)}
30+
{"security", (o, n, _) => o.Security = n.CreateList(LoadSecurityRequirement, o)}
3131
};
3232

3333
private static readonly PatternFieldMap<OpenApiDocument> _openApiPatternFields = new()

src/Microsoft.OpenApi/Services/OpenApiFilterService.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static OpenApiDocument CreateFilteredDocument(OpenApiDocument source, Fun
8080
},
8181

8282
Components = components,
83-
SecurityRequirements = source.SecurityRequirements,
83+
Security = source.Security,
8484
Servers = source.Servers
8585
};
8686

src/Microsoft.OpenApi/Services/OpenApiWalker.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void Walk(OpenApiDocument doc)
5252
Walk(OpenApiConstants.Paths, () => Walk(doc.Paths));
5353
Walk(OpenApiConstants.Webhooks, () => Walk(doc.Webhooks));
5454
Walk(OpenApiConstants.Components, () => Walk(doc.Components));
55-
Walk(OpenApiConstants.Security, () => Walk(doc.SecurityRequirements));
55+
Walk(OpenApiConstants.Security, () => Walk(doc.Security));
5656
Walk(OpenApiConstants.ExternalDocs, () => Walk(doc.ExternalDocs));
5757
Walk(OpenApiConstants.Tags, () => Walk(doc.Tags));
5858
Walk(doc as IOpenApiExtensible);

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ public async Task ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
10081008
Description = "tagDescription2"
10091009
}
10101010
},
1011-
SecurityRequirements = new List<OpenApiSecurityRequirement>
1011+
Security = new List<OpenApiSecurityRequirement>
10121012
{
10131013
new OpenApiSecurityRequirement
10141014
{
@@ -1052,7 +1052,7 @@ public async Task GlobalSecurityRequirementShouldReferenceSecurityScheme()
10521052
{
10531053
var result = await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, "securedApi.yaml"), SettingsFixture.ReaderSettings);
10541054

1055-
var securityRequirement = result.Document.SecurityRequirements[0];
1055+
var securityRequirement = result.Document.Security[0];
10561056

10571057
Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityRequirement.Keys.First());
10581058
}

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ namespace Microsoft.OpenApi.Models
718718
public Microsoft.OpenApi.Models.OpenApiInfo Info { get; set; }
719719
public System.Uri? JsonSchemaDialect { get; set; }
720720
public Microsoft.OpenApi.Models.OpenApiPaths Paths { get; set; }
721-
public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiSecurityRequirement>? SecurityRequirements { get; set; }
721+
public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiSecurityRequirement>? Security { get; set; }
722722
public System.Collections.Generic.IList<Microsoft.OpenApi.Models.OpenApiServer>? Servers { get; set; }
723723
public System.Collections.Generic.ISet<Microsoft.OpenApi.Models.OpenApiTag>? Tags { get; set; }
724724
public System.Collections.Generic.IDictionary<string, Microsoft.OpenApi.Models.Interfaces.IOpenApiPathItem>? Webhooks { get; set; }

0 commit comments

Comments
 (0)