Skip to content

Commit af5568c

Browse files
committed
Fix CodeQL warnings
1 parent eb9ba94 commit af5568c

File tree

4 files changed

+5
-26
lines changed

4 files changed

+5
-26
lines changed

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using System;

src/Microsoft.OpenApi/Models/OpenApiParameter.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
204204
/// <returns>OpenApiParameter</returns>
205205
public OpenApiParameter GetEffective(OpenApiDocument doc)
206206
{
207-
if (this.Reference != null)
208-
{
209-
return doc.ResolveReferenceTo<OpenApiParameter>(this.Reference);
210-
}
211-
else
212-
{
213-
return this;
214-
}
207+
return Reference != null ? doc.ResolveReferenceTo<OpenApiParameter>(Reference) : this;
215208
}
216209

217210
/// <summary>

src/Microsoft.OpenApi/Models/OpenApiRequestBody.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
9696
/// <returns>OpenApiRequestBody</returns>
9797
public OpenApiRequestBody GetEffective(OpenApiDocument doc)
9898
{
99-
if (this.Reference != null)
100-
{
101-
return doc.ResolveReferenceTo<OpenApiRequestBody>(this.Reference);
102-
}
103-
else
104-
{
105-
return this;
106-
}
99+
return Reference != null ? doc.ResolveReferenceTo<OpenApiRequestBody>(Reference) : this;
107100
}
108101

109102
/// <summary>
@@ -157,7 +150,7 @@ internal OpenApiBodyParameter ConvertToBodyParameter()
157150
Required = Required,
158151
Extensions = Extensions.ToDictionary(static k => k.Key, static v => v.Value) // Clone extensions so we can remove the x-bodyName extensions from the output V2 model.
159152
};
160-
if (bodyParameter.Extensions.ContainsKey(OpenApiConstants.BodyName))
153+
if (bodyParameter.Extensions.TryGetValue(OpenApiConstants.BodyName, out var bodyParameterName))
161154
{
162155
bodyParameter.Name = (Extensions[OpenApiConstants.BodyName] as OpenApiString)?.Value ?? "body";
163156
bodyParameter.Extensions.Remove(OpenApiConstants.BodyName);

src/Microsoft.OpenApi/Models/OpenApiResponse.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
101101
/// <returns>OpenApiResponse</returns>
102102
public OpenApiResponse GetEffective(OpenApiDocument doc)
103103
{
104-
if (this.Reference != null)
105-
{
106-
return doc.ResolveReferenceTo<OpenApiResponse>(this.Reference);
107-
}
108-
else
109-
{
110-
return this;
111-
}
104+
return Reference != null ? doc.ResolveReferenceTo<OpenApiResponse>(Reference) : this;
112105
}
113106

114107
/// <summary>

0 commit comments

Comments
 (0)