Skip to content

Commit 236a48d

Browse files
committed
Address PR feedback
1 parent d4eef1b commit 236a48d

File tree

9 files changed

+9
-39
lines changed

9 files changed

+9
-39
lines changed

src/Microsoft.OpenApi.Readers/V3/OpenApiSecurityRequirementDeserializer.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@ internal static partial class OpenApiV3Deserializer
1515
public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
1616
{
1717
var mapNode = node.CheckMapNode("security");
18-
string description = null;
19-
string summary = null;
2018

2119
var securityRequirement = new OpenApiSecurityRequirement();
2220

2321
foreach (var property in mapNode)
2422
{
25-
if (property.Name.Equals("description") || property.Name.Equals("summary"))
26-
{
27-
description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
28-
summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
29-
}
30-
31-
var scheme = LoadSecuritySchemeByReference(mapNode.Context, property.Name, summary, description);
23+
var scheme = LoadSecuritySchemeByReference(mapNode.Context, property.Name);
3224

3325
var scopes = property.Value.CreateSimpleList(value => value.GetScalarValue());
3426

@@ -48,17 +40,13 @@ public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
4840

4941
private static OpenApiSecurityScheme LoadSecuritySchemeByReference(
5042
ParsingContext context,
51-
string schemeName,
52-
string summary = null,
53-
string description = null)
43+
string schemeName)
5444
{
5545
var securitySchemeObject = new OpenApiSecurityScheme()
5646
{
5747
UnresolvedReference = true,
5848
Reference = new OpenApiReference()
5949
{
60-
Summary = summary,
61-
Description = description,
6250
Id = schemeName,
6351
Type = ReferenceType.SecurityScheme
6452
}

src/Microsoft.OpenApi.Readers/V31/OpenApiSecurityRequirementDeserializer.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@ internal static partial class OpenApiV31Deserializer
1515
public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
1616
{
1717
var mapNode = node.CheckMapNode("security");
18-
string description = null;
19-
string summary = null;
2018

2119
var securityRequirement = new OpenApiSecurityRequirement();
2220

2321
foreach (var property in mapNode)
2422
{
25-
if (property.Name.Equals("description") || property.Name.Equals("summary"))
26-
{
27-
description = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Description);
28-
summary = node.Context.VersionService.GetReferenceScalarValues(mapNode, OpenApiConstants.Summary);
29-
}
30-
31-
var scheme = LoadSecuritySchemeByReference(property.Name, summary, description);
23+
var scheme = LoadSecuritySchemeByReference(property.Name);
3224

3325
var scopes = property.Value.CreateSimpleList(value => value.GetScalarValue());
3426

@@ -46,18 +38,13 @@ public static OpenApiSecurityRequirement LoadSecurityRequirement(ParseNode node)
4638
return securityRequirement;
4739
}
4840

49-
private static OpenApiSecurityScheme LoadSecuritySchemeByReference(
50-
string schemeName,
51-
string summary = null,
52-
string description = null)
41+
private static OpenApiSecurityScheme LoadSecuritySchemeByReference(string schemeName)
5342
{
5443
var securitySchemeObject = new OpenApiSecurityScheme()
5544
{
5645
UnresolvedReference = true,
5746
Reference = new OpenApiReference()
5847
{
59-
Summary = summary,
60-
Description = description,
6148
Id = schemeName,
6249
Type = ReferenceType.SecurityScheme
6350
}

src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@
3636
<ItemGroup>
3737
<PackageReference Include="JsonSchema.Net" Version="4.1.5" />
3838
<PackageReference Include="JsonSchema.Net.OpenApi" Version="1.1.0" />
39-
<PackageReference Include="SharpYaml" Version="2.1.0" />
4039
</ItemGroup>
4140
<ItemGroup>
4241
<PackageReference Include="System.Text.Json" Version="7.0.2" />
43-
<PackageReference Include="Yaml2JsonNode" Version="1.1.1" />
44-
<PackageReference Include="YamlDotNet" Version="13.1.0" />
4542
</ItemGroup>
4643

4744
<ItemGroup>

src/Microsoft.OpenApi/Models/OpenApiHeader.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.OpenApi.Models
1919
/// </summary>
2020
public class OpenApiHeader : IOpenApiSerializable, IOpenApiReferenceable, IOpenApiExtensible, IEffective<OpenApiHeader>
2121
{
22-
protected JsonSchema _schema;
22+
private JsonSchema _schema;
2323

2424
/// <summary>
2525
/// Indicates if object is populated with data or is just a reference to the data

src/Microsoft.OpenApi/Models/OpenApiParameter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class OpenApiParameter : IOpenApiSerializable, IOpenApiReferenceable, IEf
2020
{
2121
private bool? _explode;
2222
private ParameterStyle? _style;
23-
protected JsonSchema _schema;
23+
private JsonSchema _schema;
2424

2525
/// <summary>
2626
/// Indicates if object is populated with data or is just a reference to the data
@@ -106,7 +106,7 @@ public virtual bool Explode
106106
public virtual bool AllowReserved { get; set; }
107107

108108
/// <summary>
109-
/// The schema defining the type used for the request body.
109+
/// The schema defining the type used for the parameter.
110110
/// </summary>
111111
public virtual JsonSchema Schema
112112
{

src/Microsoft.OpenApi/Models/References/OpenApiHeaderReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public override string Description
7373
public override bool AllowEmptyValue { get => Target.AllowEmptyValue; set => Target.AllowEmptyValue = value; }
7474

7575
/// <inheritdoc/>
76-
public override JsonSchema Schema { get => _schema; set => _schema = value; }
76+
public override JsonSchema Schema { get => Target.Schema; set => Target.Schema = value; }
7777

7878
/// <inheritdoc/>
7979
public override ParameterStyle? Style { get => Target.Style; set => Target.Style = value; }

src/Microsoft.OpenApi/Models/References/OpenApiParameterReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public override string Description
8484
public override bool AllowReserved { get => Target.AllowReserved; set => Target.AllowReserved = value; }
8585

8686
/// <inheritdoc/>
87-
public override JsonSchema Schema { get => _schema; set => _schema = value; }
87+
public override JsonSchema Schema { get => Target.Schema; set => Target.Schema = value; }
8888

8989
/// <inheritdoc/>
9090
public override IDictionary<string, OpenApiExample> Examples { get => Target.Examples; set => Target.Examples = value; }

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Microsoft.OpenApi.Models;
1414
using Microsoft.OpenApi.Properties;
1515
using Microsoft.OpenApi.Services;
16-
using YamlDotNet.Serialization.ObjectGraphVisitors;
1716

1817
namespace Microsoft.OpenApi.Writers
1918
{

test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@
313313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
314314
</PackageReference>
315315
<PackageReference Include="Yaml2JsonNode" Version="1.1.1" />
316-
<PackageReference Include="YamlDotNet" Version="13.1.0" />
317316
</ItemGroup>
318317

319318
<ItemGroup>

0 commit comments

Comments
 (0)