Merge pull request #1415 from SimonCropp/discard-un-used-parameters

baywet · web-flow · commit 741550046c3d · 2023-10-10T08:28:21.000-04:00
discard un-used parameters
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs
@@ -21,22 +21,22 @@ internal static partial class OpenApiV2Deserializer
         private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
         {
             {
-                "swagger", (o, n) =>
+                "swagger", (_, _) =>
                 {
                 } /* Version is valid field but we already parsed it */
             },
             {"info", (o, n) => o.Info = LoadInfo(n)},
-            {"host", (o, n) => n.Context.SetTempStorage("host", n.GetScalarValue())},
-            {"basePath", (o, n) => n.Context.SetTempStorage("basePath", n.GetScalarValue())},
+            {"host", (_, n) => n.Context.SetTempStorage("host", n.GetScalarValue())},
+            {"basePath", (_, n) => n.Context.SetTempStorage("basePath", n.GetScalarValue())},
             {
-                "schemes", (o, n) => n.Context.SetTempStorage(
+                "schemes", (_, n) => n.Context.SetTempStorage(
                     "schemes",
                     n.CreateSimpleList(
                         s => s.GetScalarValue()))
             },
             {
                 "consumes",
-                (o, n) =>
+                (_, n) =>
                 {
                     var consumes = n.CreateSimpleList(s => s.GetScalarValue());
                     if (consumes.Count > 0)
@@ -46,7 +46,7 @@ internal static partial class OpenApiV2Deserializer
                 }
             },
             {
-                "produces", (o, n) => {
+                "produces", (_, n) => {
                     var produces = n.CreateSimpleList(s => s.GetScalarValue());
                     if (produces.Count > 0)
                     {
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiOperationDeserializer.cs
@@ -57,15 +57,15 @@ internal static partial class OpenApiV2Deserializer
                     }
                 },
                 {
-                    "consumes", (o, n) => {
+                    "consumes", (_, n) => {
                         var consumes = n.CreateSimpleList(s => s.GetScalarValue());
                         if (consumes.Count > 0) {
                             n.Context.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);
                         }
                     }
                 },
                 {
-                    "produces", (o, n) => {
+                    "produces", (_, n) => {
                         var produces = n.CreateSimpleList(s => s.GetScalarValue());
                         if (produces.Count > 0) {
                             n.Context.SetTempStorage(TempStorageKeys.OperationProduces, produces);
@@ -185,7 +185,7 @@ private static OpenApiRequestBody CreateFormBody(ParsingContext context, List<Op
             {
                 Content = consumes.ToDictionary(
                     k => k,
-                    v => mediaType)
+                    _ => mediaType)
             };
 
             return formBody;
@@ -205,7 +205,7 @@ internal static OpenApiRequestBody CreateRequestBody(
                 Required = bodyParameter.Required,
                 Content = consumes.ToDictionary(
                     k => k,
-                    v => new OpenApiMediaType
+                    _ => new OpenApiMediaType
                     {
                         Schema = bodyParameter.Schema
                     }),
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSecuritySchemeDeserializer.cs
@@ -47,27 +47,27 @@ internal static partial class OpenApiV2Deserializer
                 {"name", (o, n) => o.Name = n.GetScalarValue()},
                 {"in", (o, n) => o.In = n.GetScalarValue().GetEnumFromDisplayName<ParameterLocation>()},
                 {
-                    "flow", (o, n) =>
+                    "flow", (_, n) =>
                     {
                         _flowValue = n.GetScalarValue();
                     }
                 },
                 {
                     "authorizationUrl",
-                    (o, n) =>
+                    (_, n) =>
                     {
                         _flow.AuthorizationUrl = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
                     }
                 },
                 {
                     "tokenUrl",
-                    (o, n) =>
+                    (_, n) =>
                     {
                         _flow.TokenUrl = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);
                     }
                 },
                 {
-                    "scopes", (o, n) =>
+                    "scopes", (_, n) =>
                     {
                         _flow.Scopes = n.CreateSimpleMap(LoadString);
                     }
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs
@@ -16,7 +16,7 @@ internal static partial class OpenApiV3Deserializer
         private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()
         {
             {
-                "openapi", (o, n) =>
+                "openapi", (_, _) =>
                 {
                 } /* Version is valid field but we already parsed it */
             },
diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs
@@ -109,7 +109,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
                     writer.WriteOptionalMap(
                        OpenApiConstants.Schemas,
                        Schemas,
-                       (w, key, component) => {
+                       (w, _, component) => {
                            component.SerializeAsV3WithoutReference(w);
                            });
                 }
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -173,7 +173,7 @@ public void SerializeAsV2(IOpenApiWriter writer)
                     writer.WriteOptionalMap(
                        OpenApiConstants.Definitions,
                        openApiSchemas,
-                       (w, key, component) =>
+                       (w, _, component) =>
                        {
                            component.SerializeAsV2WithoutReference(w);
                        });
diff --git a/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs b/src/Microsoft.OpenApi/Services/OpenApiFilterService.cs
@@ -304,12 +304,12 @@ private static void ValidateFilters(IDictionary<string, List<string>> requestUrl
         {
             if (operationIds == "*")
             {
-                return (url, operationType, operation) => true;  // All operations
+                return (_, _, _) => true;  // All operations
             }
             else
             {
                 var operationIdsArray = operationIds.Split(',');
-                return (url, operationType, operation) => operationIdsArray.Contains(operation.OperationId);
+                return (_, _, operation) => operationIdsArray.Contains(operation.OperationId);
             }
         }
 
@@ -319,11 +319,11 @@ private static void ValidateFilters(IDictionary<string, List<string>> requestUrl
             if (tagsArray.Length == 1)
             {
                 var regex = new Regex(tagsArray[0]);
-                return (url, operationType, operation) => operation.Tags.Any(tag => regex.IsMatch(tag.Name));
+                return (_, _, operation) => operation.Tags.Any(tag => regex.IsMatch(tag.Name));
             }
             else
             {
-                return (url, operationType, operation) => operation.Tags.Any(tag => tagsArray.Contains(tag.Name));
+                return (_, _, operation) => operation.Tags.Any(tag => tagsArray.Contains(tag.Name));
             }
         }
 
@@ -357,7 +357,7 @@ private static void ValidateFilters(IDictionary<string, List<string>> requestUrl
             }
 
             // predicate for matching url and operationTypes
-            return (path, operationType, operation) => operationTypes.Contains(operationType + path);
+            return (path, operationType, _) => operationTypes.Contains(operationType + path);
         }
 
         private static List<string> GetOperationTypes(IDictionary<OperationType, OpenApiOperation> openApiOperations, List<string> url, string path)
diff --git a/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs b/src/Microsoft.OpenApi/Writers/OpenApiWriterExtensions.cs
@@ -367,7 +367,7 @@ private static void WriteMapInternal<T>(
             IDictionary<string, T> elements,
             Action<IOpenApiWriter, T> action)
         {
-            WriteMapInternal(writer, name, elements, (w, k, s) => action(w, s));
+            WriteMapInternal(writer, name, elements, (w, _, s) => action(w, s));
         }
 
         private static void WriteMapInternal<T>(
diff --git a/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs b/test/Microsoft.OpenApi.Readers.Tests/TestCustomExtension.cs
@@ -27,7 +27,7 @@ public void ParseCustomExtension()
                 """;
             var settings = new OpenApiReaderSettings
             {
-                ExtensionParsers = { { "x-foo", (a,v) => {
+                ExtensionParsers = { { "x-foo", (a,_) => {
                         var fooNode = (OpenApiObject)a;
                         return new FooExtension
                         {
diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs
@@ -152,7 +152,7 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated()
 
     public class AlwaysFailRule<T> : ValidationRule<T> where T : IOpenApiElement
     {
-        public AlwaysFailRule() : base((c, t) => c.CreateError("x", "y"))
+        public AlwaysFailRule() : base((c, _) => c.CreateError("x", "y"))
         {
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -21,22 +21,22 @@ internal static partial class OpenApiV2Deserializer`
`21`	`21`	`private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()`
`22`	`22`	`{`
`23`	`23`	`{`
`24`		`- "swagger", (o, n) =>`
	`24`	`+ "swagger", (_, _) =>`
`25`	`25`	`{`
`26`	`26`	`} /* Version is valid field but we already parsed it */`
`27`	`27`	`},`
`28`	`28`	`{"info", (o, n) => o.Info = LoadInfo(n)},`
`29`		`- {"host", (o, n) => n.Context.SetTempStorage("host", n.GetScalarValue())},`
`30`		`- {"basePath", (o, n) => n.Context.SetTempStorage("basePath", n.GetScalarValue())},`
	`29`	`+ {"host", (_, n) => n.Context.SetTempStorage("host", n.GetScalarValue())},`
	`30`	`+ {"basePath", (_, n) => n.Context.SetTempStorage("basePath", n.GetScalarValue())},`
`31`	`31`	`{`
`32`		`- "schemes", (o, n) => n.Context.SetTempStorage(`
	`32`	`+ "schemes", (_, n) => n.Context.SetTempStorage(`
`33`	`33`	`"schemes",`
`34`	`34`	`n.CreateSimpleList(`
`35`	`35`	`s => s.GetScalarValue()))`
`36`	`36`	`},`
`37`	`37`	`{`
`38`	`38`	`"consumes",`
`39`		`- (o, n) =>`
	`39`	`+ (_, n) =>`
`40`	`40`	`{`
`41`	`41`	`var consumes = n.CreateSimpleList(s => s.GetScalarValue());`
`42`	`42`	`if (consumes.Count > 0)`
`@@ -46,7 +46,7 @@ internal static partial class OpenApiV2Deserializer`
`46`	`46`	`}`
`47`	`47`	`},`
`48`	`48`	`{`
`49`		`- "produces", (o, n) => {`
	`49`	`+ "produces", (_, n) => {`
`50`	`50`	`var produces = n.CreateSimpleList(s => s.GetScalarValue());`
`51`	`51`	`if (produces.Count > 0)`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,15 +57,15 @@ internal static partial class OpenApiV2Deserializer`
`57`	`57`	`}`
`58`	`58`	`},`
`59`	`59`	`{`
`60`		`- "consumes", (o, n) => {`
	`60`	`+ "consumes", (_, n) => {`
`61`	`61`	`var consumes = n.CreateSimpleList(s => s.GetScalarValue());`
`62`	`62`	`if (consumes.Count > 0) {`
`63`	`63`	`n.Context.SetTempStorage(TempStorageKeys.OperationConsumes,consumes);`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`},`
`67`	`67`	`{`
`68`		`- "produces", (o, n) => {`
	`68`	`+ "produces", (_, n) => {`
`69`	`69`	`var produces = n.CreateSimpleList(s => s.GetScalarValue());`
`70`	`70`	`if (produces.Count > 0) {`
`71`	`71`	`n.Context.SetTempStorage(TempStorageKeys.OperationProduces, produces);`
`@@ -185,7 +185,7 @@ private static OpenApiRequestBody CreateFormBody(ParsingContext context, List<Op`
`185`	`185`	`{`
`186`	`186`	`Content = consumes.ToDictionary(`
`187`	`187`	`k => k,`
`188`		`- v => mediaType)`
	`188`	`+ _ => mediaType)`
`189`	`189`	`};`
`190`	`190`
`191`	`191`	`return formBody;`
`@@ -205,7 +205,7 @@ internal static OpenApiRequestBody CreateRequestBody(`
`205`	`205`	`Required = bodyParameter.Required,`
`206`	`206`	`Content = consumes.ToDictionary(`
`207`	`207`	`k => k,`
`208`		`- v => new OpenApiMediaType`
	`208`	`+ _ => new OpenApiMediaType`
`209`	`209`	`{`
`210`	`210`	`Schema = bodyParameter.Schema`
`211`	`211`	`}),`
Original file line number	Diff line number	Diff line change
`@@ -47,27 +47,27 @@ internal static partial class OpenApiV2Deserializer`
`47`	`47`	`{"name", (o, n) => o.Name = n.GetScalarValue()},`
`48`	`48`	`{"in", (o, n) => o.In = n.GetScalarValue().GetEnumFromDisplayName<ParameterLocation>()},`
`49`	`49`	`{`
`50`		`- "flow", (o, n) =>`
	`50`	`+ "flow", (_, n) =>`
`51`	`51`	`{`
`52`	`52`	`_flowValue = n.GetScalarValue();`
`53`	`53`	`}`
`54`	`54`	`},`
`55`	`55`	`{`
`56`	`56`	`"authorizationUrl",`
`57`		`- (o, n) =>`
	`57`	`+ (_, n) =>`
`58`	`58`	`{`
`59`	`59`	`_flow.AuthorizationUrl = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);`
`60`	`60`	`}`
`61`	`61`	`},`
`62`	`62`	`{`
`63`	`63`	`"tokenUrl",`
`64`		`- (o, n) =>`
	`64`	`+ (_, n) =>`
`65`	`65`	`{`
`66`	`66`	`_flow.TokenUrl = new(n.GetScalarValue(), UriKind.RelativeOrAbsolute);`
`67`	`67`	`}`
`68`	`68`	`},`
`69`	`69`	`{`
`70`		`- "scopes", (o, n) =>`
	`70`	`+ "scopes", (_, n) =>`
`71`	`71`	`{`
`72`	`72`	`_flow.Scopes = n.CreateSimpleMap(LoadString);`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ internal static partial class OpenApiV3Deserializer`
`16`	`16`	`private static FixedFieldMap<OpenApiDocument> _openApiFixedFields = new()`
`17`	`17`	`{`
`18`	`18`	`{`
`19`		`- "openapi", (o, n) =>`
	`19`	`+ "openapi", (_, _) =>`
`20`	`20`	`{`
`21`	`21`	`} /* Version is valid field but we already parsed it */`
`22`	`22`	`},`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void SerializeAsV3(IOpenApiWriter writer)`
`109`	`109`	`writer.WriteOptionalMap(`
`110`	`110`	`OpenApiConstants.Schemas,`
`111`	`111`	`Schemas,`
`112`		`- (w, key, component) => {`
	`112`	`+ (w, _, component) => {`
`113`	`113`	`component.SerializeAsV3WithoutReference(w);`
`114`	`114`	`});`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public void SerializeAsV2(IOpenApiWriter writer)`
`173`	`173`	`writer.WriteOptionalMap(`
`174`	`174`	`OpenApiConstants.Definitions,`
`175`	`175`	`openApiSchemas,`
`176`		`- (w, key, component) =>`
	`176`	`+ (w, _, component) =>`
`177`	`177`	`{`
`178`	`178`	`component.SerializeAsV2WithoutReference(w);`
`179`	`179`	`});`
Original file line number	Diff line number	Diff line change
`@@ -304,12 +304,12 @@ private static void ValidateFilters(IDictionary<string, List<string>> requestUrl`
`304`	`304`	`{`
`305`	`305`	`if (operationIds == "*")`
`306`	`306`	`{`
`307`		`- return (url, operationType, operation) => true; // All operations`
	`307`	`+ return (_, _, _) => true; // All operations`
`308`	`308`	`}`
`309`	`309`	`else`
`310`	`310`	`{`
`311`	`311`	`var operationIdsArray = operationIds.Split(',');`
`312`		`- return (url, operationType, operation) => operationIdsArray.Contains(operation.OperationId);`
	`312`	`+ return (_, _, operation) => operationIdsArray.Contains(operation.OperationId);`
`313`	`313`	`}`
`314`	`314`	`}`
`315`	`315`
`@@ -319,11 +319,11 @@ private static void ValidateFilters(IDictionary<string, List<string>> requestUrl`
`319`	`319`	`if (tagsArray.Length == 1)`
`320`	`320`	`{`
`321`	`321`	`var regex = new Regex(tagsArray[0]);`
`322`		`- return (url, operationType, operation) => operation.Tags.Any(tag => regex.IsMatch(tag.Name));`
	`322`	`+ return (_, _, operation) => operation.Tags.Any(tag => regex.IsMatch(tag.Name));`
`323`	`323`	`}`
`324`	`324`	`else`
`325`	`325`	`{`
`326`		`- return (url, operationType, operation) => operation.Tags.Any(tag => tagsArray.Contains(tag.Name));`
	`326`	`+ return (_, _, operation) => operation.Tags.Any(tag => tagsArray.Contains(tag.Name));`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
`@@ -357,7 +357,7 @@ private static void ValidateFilters(IDictionary<string, List<string>> requestUrl`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`// predicate for matching url and operationTypes`
`360`		`- return (path, operationType, operation) => operationTypes.Contains(operationType + path);`
	`360`	`+ return (path, operationType, _) => operationTypes.Contains(operationType + path);`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`private static List<string> GetOperationTypes(IDictionary<OperationType, OpenApiOperation> openApiOperations, List<string> url, string path)`
Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ private static void WriteMapInternal<T>(`
`367`	`367`	`IDictionary<string, T> elements,`
`368`	`368`	`Action<IOpenApiWriter, T> action)`
`369`	`369`	`{`
`370`		`- WriteMapInternal(writer, name, elements, (w, k, s) => action(w, s));`
	`370`	`+ WriteMapInternal(writer, name, elements, (w, _, s) => action(w, s));`
`371`	`371`	`}`
`372`	`372`
`373`	`373`	`private static void WriteMapInternal<T>(`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public void ParseCustomExtension()`
`27`	`27`	`""";`
`28`	`28`	`var settings = new OpenApiReaderSettings`
`29`	`29`	`{`
`30`		`- ExtensionParsers = { { "x-foo", (a,v) => {`
	`30`	`+ ExtensionParsers = { { "x-foo", (a,_) => {`
`31`	`31`	`var fooNode = (OpenApiObject)a;`
`32`	`32`	`return new FooExtension`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated()`
`152`	`152`
`153`	`153`	`public class AlwaysFailRule<T> : ValidationRule<T> where T : IOpenApiElement`
`154`	`154`	`{`
`155`		`- public AlwaysFailRule() : base((c, t) => c.CreateError("x", "y"))`
	`155`	`+ public AlwaysFailRule() : base((c, _) => c.CreateError("x", "y"))`
`156`	`156`	`{`
`157`	`157`	`}`
`158`	`158`	`}`