Skip to content

Commit 2c2bbe6

Browse files
committed
chore: code fixes recommended by sonarqube
Signed-off-by: Vincent Biret <[email protected]>
1 parent dd80ab7 commit 2c2bbe6

File tree

3 files changed

+24
-34
lines changed

3 files changed

+24
-34
lines changed

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ private static void WriteHostInfoV2(IOpenApiWriter writer, IList<OpenApiServer>?
371371

372372
// Arbitrarily choose the first server given that V2 only allows
373373
// one host, port, and base path.
374-
var serverUrl = ParseServerUrl(servers.First());
374+
var serverUrl = ParseServerUrl(servers[0]);
375375

376376
// Divide the URL in the Url property into host and basePath required in OpenAPI V2
377377
// The Url property cannot contain path templating to be valid for V2 serialization.

src/Microsoft.OpenApi/Reader/OpenApiModelFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public static async Task<ReadResult> LoadAsync(string url, OpenApiReaderSettings
123123
public static async Task<T> LoadAsync<T>(string url, OpenApiSpecVersion version, OpenApiReaderSettings settings = null) where T : IOpenApiElement
124124
{
125125
var result = await RetrieveStreamAndFormatAsync(url);
126-
return Load<T>(result.Item1, version, out var diagnostic, result.Item2, settings);
126+
return Load<T>(result.Item1, version, out var _, result.Item2, settings);
127127
}
128128

129129
/// <summary>

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

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -34,46 +34,36 @@ public OpenApiDocumentTests()
3434

3535
public T Clone<T>(T element) where T : IOpenApiSerializable
3636
{
37-
using (var stream = new MemoryStream())
37+
using var stream = new MemoryStream();
38+
var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
39+
var writer = new OpenApiJsonWriter(streamWriter, new OpenApiJsonWriterSettings()
3840
{
39-
IOpenApiWriter writer;
40-
var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
41-
writer = new OpenApiJsonWriter(streamWriter, new OpenApiJsonWriterSettings()
42-
{
43-
InlineLocalReferences = true
44-
});
45-
element.SerializeAsV3(writer);
46-
writer.Flush();
47-
stream.Position = 0;
41+
InlineLocalReferences = true
42+
});
43+
element.SerializeAsV3(writer);
44+
writer.Flush();
45+
stream.Position = 0;
4846

49-
using (var streamReader = new StreamReader(stream))
50-
{
51-
var result = streamReader.ReadToEnd();
52-
return OpenApiModelFactory.Parse<T>(result, OpenApiSpecVersion.OpenApi3_0, out OpenApiDiagnostic diagnostic4);
53-
}
54-
}
47+
using var streamReader = new StreamReader(stream);
48+
var result = streamReader.ReadToEnd();
49+
return OpenApiModelFactory.Parse<T>(result, OpenApiSpecVersion.OpenApi3_0, out var _);
5550
}
5651

5752
public OpenApiSecurityScheme CloneSecurityScheme(OpenApiSecurityScheme element)
5853
{
59-
using (var stream = new MemoryStream())
54+
using var stream = new MemoryStream();
55+
var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
56+
var writer = new OpenApiJsonWriter(streamWriter, new OpenApiJsonWriterSettings()
6057
{
61-
IOpenApiWriter writer;
62-
var streamWriter = new FormattingStreamWriter(stream, CultureInfo.InvariantCulture);
63-
writer = new OpenApiJsonWriter(streamWriter, new OpenApiJsonWriterSettings()
64-
{
65-
InlineLocalReferences = true
66-
});
67-
element.SerializeAsV3(writer);
68-
writer.Flush();
69-
stream.Position = 0;
58+
InlineLocalReferences = true
59+
});
60+
element.SerializeAsV3(writer);
61+
writer.Flush();
62+
stream.Position = 0;
7063

71-
using (var streamReader = new StreamReader(stream))
72-
{
73-
var result = streamReader.ReadToEnd();
74-
return OpenApiModelFactory.Parse<OpenApiSecurityScheme>(result, OpenApiSpecVersion.OpenApi3_0, out OpenApiDiagnostic diagnostic4);
75-
}
76-
}
64+
using var streamReader = new StreamReader(stream);
65+
var result = streamReader.ReadToEnd();
66+
return OpenApiModelFactory.Parse<OpenApiSecurityScheme>(result, OpenApiSpecVersion.OpenApi3_0, out var _);
7767
}
7868

7969
[Fact]

0 commit comments

Comments
 (0)