Skip to content

Commit fa367ab

Browse files
baywetbaywet
authored
Merge pull request #1368 from SimonCropp/using-declarations
using declarations
2 parents 8ca00d1 + e3498c2 commit fa367ab

21 files changed

+1262
-1376
lines changed

‎src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ public async Task<ReadResult> ReadAsync(Stream input, CancellationToken cancella
7373
bufferedStream.Position = 0;
7474
}
7575

76-
using (var reader = new StreamReader(bufferedStream))
77-
{
78-
return await new OpenApiTextReaderReader(_settings).ReadAsync(reader, cancellationToken);
79-
}
76+
using var reader = new StreamReader(bufferedStream);
77+
return await new OpenApiTextReaderReader(_settings).ReadAsync(reader, cancellationToken);
8078
}
8179

8280
/// <summary>
@@ -88,10 +86,8 @@ public async Task<ReadResult> ReadAsync(Stream input, CancellationToken cancella
8886
/// <returns>Instance of newly created OpenApiDocument</returns>
8987
public T ReadFragment<T>(Stream input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic) where T : IOpenApiReferenceable
9088
{
91-
using (var reader = new StreamReader(input))
92-
{
93-
return new OpenApiTextReaderReader(_settings).ReadFragment<T>(reader, version, out diagnostic);
94-
}
89+
using var reader = new StreamReader(input);
90+
return new OpenApiTextReaderReader(_settings).ReadFragment<T>(reader, version, out diagnostic);
9591
}
9692
}
9793
}

‎src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,17 @@ public OpenApiStringReader(OpenApiReaderSettings settings = null)
2929
/// </summary>
3030
public OpenApiDocument Read(string input, out OpenApiDiagnostic diagnostic)
3131
{
32-
using (var reader = new StringReader(input))
33-
{
34-
return new OpenApiTextReaderReader(_settings).Read(reader, out diagnostic);
35-
}
32+
using var reader = new StringReader(input);
33+
return new OpenApiTextReaderReader(_settings).Read(reader, out diagnostic);
3634
}
3735

3836
/// <summary>
3937
/// Reads the string input and parses it into an Open API element.
4038
/// </summary>
4139
public T ReadFragment<T>(string input, OpenApiSpecVersion version, out OpenApiDiagnostic diagnostic) where T : IOpenApiElement
4240
{
43-
using (var reader = new StringReader(input))
44-
{
45-
return new OpenApiTextReaderReader(_settings).ReadFragment<T>(reader, version, out diagnostic);
46-
}
41+
using var reader = new StringReader(input);
42+
return new OpenApiTextReaderReader(_settings).ReadFragment<T>(reader, version, out diagnostic);
4743
}
4844
}
4945
}

‎src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,12 @@ public static string Serialize<T>(
179179
throw Error.ArgumentNull(nameof(element));
180180
}
181181

182-
using (var stream = new MemoryStream())
183-
{
184-
element.Serialize(stream, specVersion, format);
185-
stream.Position = 0;
182+
using var stream = new MemoryStream();
183+
element.Serialize(stream, specVersion, format);
184+
stream.Position = 0;
186185

187-
using (var streamReader = new StreamReader(stream))
188-
{
189-
return streamReader.ReadToEnd();
190-
}
191-
}
186+
using var streamReader = new StreamReader(stream);
187+
return streamReader.ReadToEnd();
192188
}
193189
}
194190
}

‎test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiDiagnosticTests.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,21 @@ public class OpenApiDiagnosticTests
1919
[Fact]
2020
public void DetectedSpecificationVersionShouldBeV2_0()
2121
{
22-
using (var stream = Resources.GetStream("V2Tests/Samples/basic.v2.yaml"))
23-
{
24-
new OpenApiStreamReader().Read(stream, out var diagnostic);
22+
using var stream = Resources.GetStream("V2Tests/Samples/basic.v2.yaml");
23+
new OpenApiStreamReader().Read(stream, out var diagnostic);
2524

26-
diagnostic.Should().NotBeNull();
27-
diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi2_0);
28-
}
25+
diagnostic.Should().NotBeNull();
26+
diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi2_0);
2927
}
3028

3129
[Fact]
3230
public void DetectedSpecificationVersionShouldBeV3_0()
3331
{
34-
using (var stream = Resources.GetStream("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml"))
35-
{
36-
new OpenApiStreamReader().Read(stream, out var diagnostic);
32+
using var stream = Resources.GetStream("V3Tests/Samples/OpenApiDocument/minimalDocument.yaml");
33+
new OpenApiStreamReader().Read(stream, out var diagnostic);
3734

38-
diagnostic.Should().NotBeNull();
39-
diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi3_0);
40-
}
35+
diagnostic.Should().NotBeNull();
36+
diagnostic.SpecificationVersion.Should().Be(OpenApiSpecVersion.OpenApi3_0);
4137
}
4238

4339
[Fact]

‎test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,19 @@ public class OpenApiStreamReaderTests
1313
[Fact]
1414
public void StreamShouldCloseIfLeaveStreamOpenSettingEqualsFalse()
1515
{
16-
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml")))
17-
{
18-
var reader = new OpenApiStreamReader(new OpenApiReaderSettings { LeaveStreamOpen = false });
19-
reader.Read(stream, out _);
20-
Assert.False(stream.CanRead);
21-
}
16+
using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml"));
17+
var reader = new OpenApiStreamReader(new OpenApiReaderSettings { LeaveStreamOpen = false });
18+
reader.Read(stream, out _);
19+
Assert.False(stream.CanRead);
2220
}
2321

2422
[Fact]
2523
public void StreamShouldNotCloseIfLeaveStreamOpenSettingEqualsTrue()
2624
{
27-
using (var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml")))
28-
{
29-
var reader = new OpenApiStreamReader(new OpenApiReaderSettings { LeaveStreamOpen = true});
30-
reader.Read(stream, out _);
31-
Assert.True(stream.CanRead);
32-
}
25+
using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "petStore.yaml"));
26+
var reader = new OpenApiStreamReader(new OpenApiReaderSettings { LeaveStreamOpen = true});
27+
reader.Read(stream, out _);
28+
Assert.True(stream.CanRead);
3329
}
3430
}
3531
}

‎test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/UnsupportedSpecVersionTests.cs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@ public class UnsupportedSpecVersionTests
1313
[Fact]
1414
public void ThrowOpenApiUnsupportedSpecVersionException()
1515
{
16-
using (var stream = Resources.GetStream("OpenApiReaderTests/Samples/unsupported.v1.yaml"))
16+
using var stream = Resources.GetStream("OpenApiReaderTests/Samples/unsupported.v1.yaml");
17+
try
1718
{
18-
try
19-
{
20-
new OpenApiStreamReader().Read(stream, out var diagnostic);
21-
}
22-
catch (OpenApiUnsupportedSpecVersionException exception)
23-
{
24-
exception.SpecificationVersion.Should().Be("1.0.0");
25-
}
19+
new OpenApiStreamReader().Read(stream, out var diagnostic);
20+
}
21+
catch (OpenApiUnsupportedSpecVersionException exception)
22+
{
23+
exception.SpecificationVersion.Should().Be("1.0.0");
2624
}
2725
}
2826
}

‎test/Microsoft.OpenApi.Readers.Tests/Resources.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ internal static class Resources
1414
/// <returns>The file contents.</returns>
1515
public static string GetString(string fileName)
1616
{
17-
using (Stream stream = GetStream(fileName))
18-
using (TextReader reader = new StreamReader(stream))
19-
{
20-
return reader.ReadToEnd();
21-
}
17+
using Stream stream = GetStream(fileName);
18+
using TextReader reader = new StreamReader(stream);
19+
return reader.ReadToEnd();
2220
}
2321

2422
/// <summary>

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,14 @@ public class ComparisonTests
1818
//[InlineData("definitions")] //Currently broken due to V3 references not behaving the same as V2
1919
public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string fileName)
2020
{
21-
using (var streamV2 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml")))
22-
using (var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml")))
23-
{
24-
var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var diagnosticV2);
25-
var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var diagnosticV3);
21+
using var streamV2 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml"));
22+
using var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml"));
23+
var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var diagnosticV2);
24+
var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var diagnosticV3);
2625

27-
openApiDocV3.Should().BeEquivalentTo(openApiDocV2);
26+
openApiDocV3.Should().BeEquivalentTo(openApiDocV2);
2827

29-
diagnosticV2.Errors.Should().BeEquivalentTo(diagnosticV3.Errors);
30-
}
28+
diagnosticV2.Errors.Should().BeEquivalentTo(diagnosticV3.Errors);
3129
}
3230
}
3331
}

0 commit comments

Comments
 (0)