Merge pull request #1377 from SimonCropp/remove-some-un-used-fields

baywet · web-flow · commit 53c74417f7e1 · 2023-10-03T08:58:26.000-04:00
remove some un used fields
diff --git a/src/Microsoft.OpenApi.Readers/Services/OpenApiRemoteReferenceCollector.cs b/src/Microsoft.OpenApi.Readers/Services/OpenApiRemoteReferenceCollector.cs
@@ -13,12 +13,7 @@ namespace Microsoft.OpenApi.Readers.Services
     /// </summary>
     internal class OpenApiRemoteReferenceCollector : OpenApiVisitorBase
     {
-        private OpenApiDocument _document;
         private Dictionary<string, OpenApiReference> _references = new Dictionary<string, OpenApiReference>();
-        public OpenApiRemoteReferenceCollector(OpenApiDocument document)
-        {
-            _document = document;
-        }
 
         /// <summary>
         /// List of external references collected from OpenApiDocument
diff --git a/src/Microsoft.OpenApi.Readers/Services/OpenApiWorkspaceLoader.cs b/src/Microsoft.OpenApi.Readers/Services/OpenApiWorkspaceLoader.cs
@@ -26,7 +26,7 @@ internal async Task<OpenApiDiagnostic> LoadAsync(OpenApiReference reference, Ope
             document.Workspace = _workspace;
 
             // Collect remote references by walking document
-            var referenceCollector = new OpenApiRemoteReferenceCollector(document);
+            var referenceCollector = new OpenApiRemoteReferenceCollector();
             var collectorWalker = new OpenApiWalker(referenceCollector);
             collectorWalker.Walk(document);
 
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -24,8 +24,6 @@ public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";
 
-        private readonly ITestOutputHelper _output;
-
         public T Clone<T>(T element) where T : IOpenApiSerializable
         {
             using var stream = new MemoryStream();
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiCallbackTests.cs
@@ -9,7 +9,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -98,13 +97,6 @@ public class OpenApiCallbackTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiCallbackTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -245,13 +244,6 @@ public class OpenApiComponentsTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiComponentsTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void SerializeBasicComponentsAsJsonWorks()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -1278,13 +1278,6 @@ public class OpenApiDocumentTests
             Components = AdvancedComponents
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiDocumentTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiExampleTests.cs
@@ -11,7 +11,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -101,13 +100,6 @@ public class OpenApiExampleTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiExampleTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiHeaderTests.cs
@@ -41,13 +41,6 @@ public class OpenApiHeaderTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiHeaderTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiLinkTests.cs
@@ -10,7 +10,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -71,13 +70,6 @@ public class OpenApiLinkTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiLinkTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -38,13 +37,6 @@ public class OpenApiOAuthFlowTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiOAuthFlowTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void SerializeBasicOAuthFlowAsV3JsonWorks()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowsTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -52,13 +51,6 @@ public class OpenApiOAuthFlowsTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiOAuthFlowsTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void SerializeBasicOAuthFlowsAsV3JsonWorks()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -295,13 +294,6 @@ [new OpenApiSecurityScheme
                 }
             };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiOperationTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void SerializeBasicOperationAsV3JsonWorks()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs
@@ -12,7 +12,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -162,13 +161,6 @@ public class OpenApiParameterTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiParameterTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(ParameterStyle.Form, true)]
         [InlineData(ParameterStyle.SpaceDelimited, false)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiRequestBodyTests.cs
@@ -8,7 +8,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -53,13 +52,6 @@ public class OpenApiRequestBodyTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiRequestBodyTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(true)]
         [InlineData(false)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs
@@ -13,7 +13,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -109,13 +108,6 @@ public class OpenApiResponseTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiResponseTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Theory]
         [InlineData(OpenApiSpecVersion.OpenApi3_0, OpenApiFormat.Json)]
         [InlineData(OpenApiSpecVersion.OpenApi2_0, OpenApiFormat.Json)]
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSchemaTests.cs
@@ -14,7 +14,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -219,13 +218,6 @@ public class OpenApiSchemaTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiSchemaTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void SerializeBasicSchemaAsV3JsonWorks()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs
@@ -12,7 +12,6 @@
 using Microsoft.OpenApi.Writers;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Models
 {
@@ -120,13 +119,6 @@ public class OpenApiSecuritySchemeTests
             }
         };
 
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiSecuritySchemeTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void SerializeApiKeySecuritySchemeAsV3JsonWorks()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs
@@ -12,20 +12,12 @@
 using Microsoft.OpenApi.Validations.Rules;
 using Microsoft.OpenApi.Writers;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Services
 {
     [Collection("DefaultSettings")]
     public class OpenApiValidatorTests
     {
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiValidatorTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void ResponseMustHaveADescription()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Validations/ValidationRuleSetTests.cs b/test/Microsoft.OpenApi.Tests/Validations/ValidationRuleSetTests.cs
@@ -2,19 +2,11 @@
 // Licensed under the MIT license.
 
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Validations.Tests
 {
     public class ValidationRuleSetTests
     {
-        private readonly ITestOutputHelper _output;
-
-        public ValidationRuleSetTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         [Fact]
         public void DefaultRuleSetReturnsTheCorrectRules()
         {
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs
@@ -11,20 +11,12 @@
 using Microsoft.OpenApi.Writers;
 using Newtonsoft.Json;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace Microsoft.OpenApi.Tests.Writers
 {
     [Collection("DefaultSettings")]
     public class OpenApiJsonWriterTests
     {
-        private readonly ITestOutputHelper _output;
-
-        public OpenApiJsonWriterTests(ITestOutputHelper output)
-        {
-            _output = output;
-        }
-
         static bool[] shouldProduceTerseOutputValues = new[] { true, false };
 
         public static IEnumerable<object[]> WriteStringListAsJsonShouldMatchExpectedTestCases()
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiWriterSpecialCharacterTests.cs
diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiYamlWriterTests.cs

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@ public class OpenApiDocumentTests`
`24`	`24`	`{`
`25`	`25`	`private const string SampleFolderPath = "V3Tests/Samples/OpenApiDocument/";`
`26`	`26`
`27`		`- private readonly ITestOutputHelper _output;`
`28`		`-`
`29`	`27`	`public T Clone<T>(T element) where T : IOpenApiSerializable`
`30`	`28`	`{`
`31`	`29`	`using var stream = new MemoryStream();`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`using Microsoft.OpenApi.Extensions;`
`8`	`8`	`using Microsoft.OpenApi.Models;`
`9`	`9`	`using Xunit;`
`10`		`-using Xunit.Abstractions;`
`11`	`10`
`12`	`11`	`namespace Microsoft.OpenApi.Tests.Models`
`13`	`12`	`{`
`@@ -245,13 +244,6 @@ public class OpenApiComponentsTests`
`245`	`244`	`}`
`246`	`245`	`};`
`247`	`246`
`248`		`- private readonly ITestOutputHelper _output;`
`249`		`-`
`250`		`- public OpenApiComponentsTests(ITestOutputHelper output)`
`251`		`- {`
`252`		`- _output = output;`
`253`		`- }`
`254`		`-`
`255`	`247`	`[Fact]`
`256`	`248`	`public void SerializeBasicComponentsAsJsonWorks()`
`257`	`249`	`{`