From e397649e109b81cf86e417e05aa4a7829e22f866 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sun, 8 Oct 2023 22:17:09 +1100 Subject: [PATCH] use some var --- .../Formatters/PowerShellFormatter.cs | 2 +- .../Handlers/PluginCommandHandler.cs | 4 ++-- .../Handlers/ShowCommandHandler.cs | 4 ++-- .../Handlers/TransformCommandHandler.cs | 4 ++-- .../Handlers/ValidateCommandHandler.cs | 4 ++-- src/Microsoft.OpenApi.Hidi/OpenApiService.cs | 18 ++++++++--------- .../OpenApiSpecVersionHelper.cs | 2 +- .../OpenApiYamlDocumentReader.cs | 2 +- .../ParsingContext.cs | 2 +- .../V2/OpenApiDocumentDeserializer.cs | 6 +++--- .../V2/OpenApiParameterDeserializer.cs | 2 +- .../V2/OpenApiV2VersionService.cs | 2 +- .../V3/OpenApiV3VersionService.cs | 2 +- .../EnumBindingSourceExtension.cs | 8 ++++---- .../Any/OpenApiAnyCloneHelper.cs | 4 ++-- .../Models/OpenApiComponents.cs | 2 +- .../Models/OpenApiDocument.cs | 6 +++--- .../Services/OpenApiReferenceResolver.cs | 4 ++-- .../Services/OpenApiWalker.cs | 19 ++++++++---------- .../Services/OpenApiWorkspace.cs | 2 +- .../Validations/Rules/OpenApiSchemaRules.cs | 2 +- .../Validations/Rules/RuleHelpers.cs | 2 +- .../Validations/ValidationExtensions.cs | 4 ++-- .../Validations/ValidationRule.cs | 2 +- .../Validations/ValidationRuleSet.cs | 10 +++++----- .../Writers/OpenApiYamlWriter.cs | 2 +- .../Services/OpenApiServiceTests.cs | 12 +++++------ .../Resources.cs | 6 +++--- .../V2Tests/OpenApiDocumentTests.cs | 10 +++++----- .../V3Tests/OpenApiDocumentTests.cs | 4 ++-- .../Expressions/BodyExpressionTests.cs | 4 ++-- .../Expressions/HeaderExpressionTests.cs | 2 +- .../Expressions/PathExpressionTests.cs | 2 +- .../Expressions/QueryExpressionTests.cs | 2 +- .../Expressions/RequestExpressionTests.cs | 4 ++-- .../Expressions/ResponseExpressionTests.cs | 4 ++-- .../Expressions/RuntimeExpressionTests.cs | 20 +++++++++---------- .../Expressions/SourceExpressionTests.cs | 10 +++++----- .../OpenApiDeprecationExtensionTests.cs | 8 ++++---- .../OpenApiEnumFlagsExtensionTests.cs | 10 +++++----- ...nApiEnumValuesDescriptionExtensionTests.cs | 8 ++++---- .../OpenApiPagingExtensionsTests.cs | 2 +- ...penApiPrimaryErrorMessageExtensionTests.cs | 6 +++--- .../Models/OpenApiDocumentTests.cs | 2 +- .../Models/OpenApiSecurityRequirementTests.cs | 4 ++-- .../Services/OpenApiUrlTreeNodeTests.cs | 2 +- .../OpenApiComponentsValidationTests.cs | 6 +++--- .../OpenApiContactValidationTests.cs | 6 +++--- .../OpenApiExternalDocsValidationTests.cs | 6 +++--- .../OpenApiHeaderValidationTests.cs | 4 ++-- .../Validations/OpenApiInfoValidationTests.cs | 6 +++--- .../OpenApiLicenseValidationTests.cs | 6 +++--- .../OpenApiMediaTypeValidationTests.cs | 4 ++-- .../OpenApiOAuthFlowValidationTests.cs | 8 ++++---- .../OpenApiParameterValidationTests.cs | 12 +++++------ .../OpenApiReferenceValidationTests.cs | 6 +++--- .../OpenApiResponseValidationTests.cs | 6 +++--- .../OpenApiSchemaValidationTests.cs | 10 +++++----- .../OpenApiServerValidationTests.cs | 6 +++--- .../Validations/OpenApiTagValidationTests.cs | 12 +++++------ 60 files changed, 169 insertions(+), 172 deletions(-) diff --git a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs index d473fcd58..96d3cc17d 100644 --- a/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs +++ b/src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs @@ -122,7 +122,7 @@ private static string SingularizeAndDeduplicateOperationId(IList operati var lastSegmentIndex = segmentsCount - 1; var singularizedSegments = new List(); - for (int x = 0; x < segmentsCount; x++) + for (var x = 0; x < segmentsCount; x++) { var segment = operationIdSegments[x].Singularize(inputIsKnownToBePlural: false); diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs index 2c7e921bb..bd240f00e 100644 --- a/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs +++ b/src/Microsoft.OpenApi.Hidi/Handlers/PluginCommandHandler.cs @@ -24,8 +24,8 @@ public int Invoke(InvocationContext context) } public async Task InvokeAsync(InvocationContext context) { - HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); - CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); + var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); + var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel); var logger = loggerFactory.CreateLogger(); diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs index 054912302..dc2f6d8c8 100644 --- a/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs +++ b/src/Microsoft.OpenApi.Hidi/Handlers/ShowCommandHandler.cs @@ -24,8 +24,8 @@ public int Invoke(InvocationContext context) } public async Task InvokeAsync(InvocationContext context) { - HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); - CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); + var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); + var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel); var logger = loggerFactory.CreateLogger(); diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs index 293fefec9..c9f46b7ee 100644 --- a/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs +++ b/src/Microsoft.OpenApi.Hidi/Handlers/TransformCommandHandler.cs @@ -24,8 +24,8 @@ public int Invoke(InvocationContext context) } public async Task InvokeAsync(InvocationContext context) { - HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); - CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); + var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); + var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel); var logger = loggerFactory.CreateLogger(); diff --git a/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs b/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs index 4351a04cb..e0bfbf6b3 100644 --- a/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs +++ b/src/Microsoft.OpenApi.Hidi/Handlers/ValidateCommandHandler.cs @@ -26,8 +26,8 @@ public int Invoke(InvocationContext context) } public async Task InvokeAsync(InvocationContext context) { - HidiOptions hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); - CancellationToken cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); + var hidiOptions = new HidiOptions(context.ParseResult, CommandOptions); + var cancellationToken = (CancellationToken)context.BindingContext.GetRequiredService(typeof(CancellationToken)); using var loggerFactory = Logger.ConfigureLogger(hidiOptions.LogLevel); var logger = loggerFactory.CreateLogger(); try diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs index 22cf230a5..841dd5f20 100644 --- a/src/Microsoft.OpenApi.Hidi/OpenApiService.cs +++ b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs @@ -66,8 +66,8 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l } // Default to yaml and OpenApiVersion 3 during csdl to OpenApi conversion - OpenApiFormat openApiFormat = options.OpenApiFormat ?? (!string.IsNullOrEmpty(options.OpenApi) ? GetOpenApiFormat(options.OpenApi, logger) : OpenApiFormat.Yaml); - OpenApiSpecVersion openApiVersion = options.Version != null ? TryParseOpenApiSpecVersion(options.Version) : OpenApiSpecVersion.OpenApi3_0; + var openApiFormat = options.OpenApiFormat ?? (!string.IsNullOrEmpty(options.OpenApi) ? GetOpenApiFormat(options.OpenApi, logger) : OpenApiFormat.Yaml); + var openApiVersion = options.Version != null ? TryParseOpenApiSpecVersion(options.Version) : OpenApiSpecVersion.OpenApi3_0; // If ApiManifest is provided, set the referenced OpenAPI document var apiDependency = await FindApiDependency(options.FilterOptions.FilterByApiManifest, logger, cancellationToken).ConfigureAwait(false); @@ -85,7 +85,7 @@ public static async Task TransformOpenApiDocument(HidiOptions options, ILogger l } // Load OpenAPI document - OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false); + var document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false); if (options.FilterOptions != null) { @@ -227,7 +227,7 @@ private static async Task GetOpenApi(HidiOptions options, ILogg Stream? filteredStream = null; if (!string.IsNullOrEmpty(options.CsdlFilter)) { - XslCompiledTransform transform = GetFilterTransform(); + var transform = GetFilterTransform(); filteredStream = ApplyFilterToCsdl(stream, options.CsdlFilter, transform); filteredStream.Position = 0; await stream.DisposeAsync().ConfigureAwait(false); @@ -299,7 +299,7 @@ private static Dictionary> GetRequestUrlsFromManifest(ApiDe private static XslCompiledTransform GetFilterTransform() { XslCompiledTransform transform = new(); - Assembly assembly = typeof(OpenApiService).GetTypeInfo().Assembly; + var assembly = typeof(OpenApiService).GetTypeInfo().Assembly; using var xslt = assembly.GetManifestResourceStream("Microsoft.OpenApi.Hidi.CsdlFilter.xslt") ?? throw new InvalidOperationException("Could not find the Microsoft.OpenApi.Hidi.CsdlFilter.xslt file in the assembly. Check build configuration."); using var streamReader = new StreamReader(xslt); using var textReader = new XmlTextReader(streamReader); @@ -310,7 +310,7 @@ private static XslCompiledTransform GetFilterTransform() private static Stream ApplyFilterToCsdl(Stream csdlStream, string entitySetOrSingleton, XslCompiledTransform transform) { using StreamReader inputReader = new(csdlStream, leaveOpen: true); - using XmlReader inputXmlReader = XmlReader.Create(inputReader); + using var inputXmlReader = XmlReader.Create(inputReader); MemoryStream filteredStream = new(); using StreamWriter writer = new(filteredStream, leaveOpen: true); XsltArgumentList args = new(); @@ -363,7 +363,7 @@ public static async Task ValidateOpenApiDocument( private static async Task ParseOpenApi(string openApiFile, bool inlineExternal, ILogger logger, Stream stream, CancellationToken cancellationToken = default) { ReadResult result; - Stopwatch stopwatch = Stopwatch.StartNew(); + var stopwatch = Stopwatch.StartNew(); using (logger.BeginScope("Parsing OpenAPI: {OpenApiFile}", openApiFile)) { stopwatch.Start(); @@ -398,7 +398,7 @@ public static async Task ConvertCsdlToOpenApi(Stream csdl, stri var edmModel = CsdlReader.Parse(XElement.Parse(csdlText).CreateReader()); settings ??= SettingsUtilities.GetConfiguration(); - OpenApiDocument document = edmModel.ConvertToOpenApi(SettingsUtilities.GetOpenApiConvertSettings(settings, metadataVersion)); + var document = edmModel.ConvertToOpenApi(SettingsUtilities.GetOpenApiConvertSettings(settings, metadataVersion)); document = FixReferences(document); return document; @@ -725,7 +725,7 @@ internal static async Task PluginManifest(HidiOptions options, ILogger logger, C } // Load OpenAPI document - OpenApiDocument document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false); + var document = await GetOpenApi(options, logger, options.MetadataVersion, cancellationToken).ConfigureAwait(false); cancellationToken.ThrowIfCancellationRequested(); diff --git a/src/Microsoft.OpenApi.Hidi/OpenApiSpecVersionHelper.cs b/src/Microsoft.OpenApi.Hidi/OpenApiSpecVersionHelper.cs index 95ffceeaa..e7250fb82 100644 --- a/src/Microsoft.OpenApi.Hidi/OpenApiSpecVersionHelper.cs +++ b/src/Microsoft.OpenApi.Hidi/OpenApiSpecVersionHelper.cs @@ -16,7 +16,7 @@ public static OpenApiSpecVersion TryParseOpenApiSpecVersion(string value) } var res = value.Split('.', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); - if (int.TryParse(res, out int result)) + if (int.TryParse(res, out var result)) { if (result >= 2 && result < 3) { diff --git a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs index c0626aa17..1e1973d37 100644 --- a/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs +++ b/src/Microsoft.OpenApi.Readers/OpenApiYamlDocumentReader.cs @@ -152,7 +152,7 @@ private Task LoadExternalRefs(OpenApiDocument document, Cance private void ResolveReferences(OpenApiDiagnostic diagnostic, OpenApiDocument document) { - List errors = new List(); + var errors = new List(); // Resolve References if requested switch (_settings.ReferenceResolution) diff --git a/src/Microsoft.OpenApi.Readers/ParsingContext.cs b/src/Microsoft.OpenApi.Readers/ParsingContext.cs index eb7459d10..6227514b8 100644 --- a/src/Microsoft.OpenApi.Readers/ParsingContext.cs +++ b/src/Microsoft.OpenApi.Readers/ParsingContext.cs @@ -89,7 +89,7 @@ internal T ParseFragment(YamlDocument yamlDocument, OpenApiSpecVersion versio { var node = ParseNode.Create(this, yamlDocument.RootNode); - T element = default(T); + var element = default(T); switch (version) { diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs index 92643cb92..097c38fbc 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiDocumentDeserializer.cs @@ -138,7 +138,7 @@ private static void MakeServers(IList servers, ParsingContext con var host = context.GetFromTempStorage("host"); var basePath = context.GetFromTempStorage("basePath"); var schemes = context.GetFromTempStorage>("schemes"); - Uri defaultUrl = rootNode.Context.BaseUrl; + var defaultUrl = rootNode.Context.BaseUrl; // so we don't default to the document path when a host is provided if (string.IsNullOrEmpty(basePath) && !string.IsNullOrEmpty(host)) @@ -172,7 +172,7 @@ private static void MakeServers(IList servers, ParsingContext con } // Create the Server objects - if (schemes != null && schemes.Count > 0) + if (schemes is {Count: > 0}) { foreach (var scheme in schemes) { @@ -295,7 +295,7 @@ private static void FixRequestBodyReferences(OpenApiDocument doc) { // Walk all unresolved parameter references // if id matches with request body Id, change type - if (doc.Components?.RequestBodies != null && doc.Components?.RequestBodies.Count > 0) + if (doc.Components?.RequestBodies is {Count: > 0}) { var fixer = new RequestBodyReferenceFixer(doc.Components?.RequestBodies); var walker = new OpenApiWalker(fixer); diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs index b0013d9ae..76926ecc2 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiParameterDeserializer.cs @@ -288,7 +288,7 @@ public static OpenApiParameter LoadParameter(ParseNode node, bool loadRequestBod node.Context.SetTempStorage("schema", null); } - bool isBodyOrFormData = (bool)node.Context.GetFromTempStorage(TempStorageKeys.ParameterIsBodyOrFormData); + var isBodyOrFormData = (bool)node.Context.GetFromTempStorage(TempStorageKeys.ParameterIsBodyOrFormData); if (isBodyOrFormData && !loadRequestBody) { return null; // Don't include Form or Body parameters when normal parameters are loaded. diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs index 2ddf6321c..86a7e2393 100644 --- a/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs +++ b/src/Microsoft.OpenApi.Readers/V2/OpenApiV2VersionService.cs @@ -177,7 +177,7 @@ public OpenApiReference ConvertToOpenApiReference(string reference, ReferenceTyp } // Where fragments point into a non-OpenAPI document, the id will be the complete fragment identifier - string id = segments[1]; + var id = segments[1]; // $ref: externalSource.yaml#/Pet if (id.StartsWith("/definitions/")) { diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs index 73fedb662..96cf563f2 100644 --- a/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs +++ b/src/Microsoft.OpenApi.Readers/V3/OpenApiV3VersionService.cs @@ -110,7 +110,7 @@ public OpenApiReference ConvertToOpenApiReference( } } // Where fragments point into a non-OpenAPI document, the id will be the complete fragment identifier - string id = segments[1]; + var id = segments[1]; var openApiReference = new OpenApiReference(); // $ref: externalSource.yaml#/Pet diff --git a/src/Microsoft.OpenApi.Workbench/EnumBindingSourceExtension.cs b/src/Microsoft.OpenApi.Workbench/EnumBindingSourceExtension.cs index d1f8bd798..907870ed2 100644 --- a/src/Microsoft.OpenApi.Workbench/EnumBindingSourceExtension.cs +++ b/src/Microsoft.OpenApi.Workbench/EnumBindingSourceExtension.cs @@ -16,7 +16,7 @@ public Type EnumType { if (null != value) { - Type enumType = Nullable.GetUnderlyingType(value) ?? value; + var enumType = Nullable.GetUnderlyingType(value) ?? value; if (!enumType.IsEnum) throw new ArgumentException("Type must be for an Enum."); } @@ -38,13 +38,13 @@ public override object ProvideValue(IServiceProvider serviceProvider) if (null == this._enumType) throw new InvalidOperationException("The EnumType must be specified."); - Type actualEnumType = Nullable.GetUnderlyingType(this._enumType) ?? this._enumType; - Array enumValues = Enum.GetValues(actualEnumType); + var actualEnumType = Nullable.GetUnderlyingType(this._enumType) ?? this._enumType; + var enumValues = Enum.GetValues(actualEnumType); if (actualEnumType == this._enumType) return enumValues; - Array tempArray = Array.CreateInstance(actualEnumType, enumValues.Length + 1); + var tempArray = Array.CreateInstance(actualEnumType, enumValues.Length + 1); enumValues.CopyTo(tempArray, 1); return tempArray; } diff --git a/src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs b/src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs index 4a67e074e..b0e553f71 100644 --- a/src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs +++ b/src/Microsoft.OpenApi/Any/OpenApiAnyCloneHelper.cs @@ -20,9 +20,9 @@ public static IOpenApiAny CloneFromCopyConstructor(IOpenApiAny obj) if (obj != null) { var t = obj.GetType(); - foreach (ConstructorInfo ci in t.GetConstructors()) + foreach (var ci in t.GetConstructors()) { - ParameterInfo[] pi = ci.GetParameters(); + var pi = ci.GetParameters(); if (pi.Length == 1 && pi[0].ParameterType == t) { return (IOpenApiAny)ci.Invoke(new object[] { obj }); diff --git a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs index 31b7282f3..0f4262455 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiComponents.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiComponents.cs @@ -101,7 +101,7 @@ public void SerializeAsV3(IOpenApiWriter writer) { var loops = writer.GetSettings().LoopDetector.Loops; writer.WriteStartObject(); - if (loops.TryGetValue(typeof(OpenApiSchema), out List schemas)) + if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas)) { var openApiSchemas = schemas.Cast().Distinct().ToList() .ToDictionary(k => k.Reference.Id); diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs index c2fa42890..b761f112e 100644 --- a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs +++ b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs @@ -160,7 +160,7 @@ public void SerializeAsV2(IOpenApiWriter writer) { var loops = writer.GetSettings().LoopDetector.Loops; - if (loops.TryGetValue(typeof(OpenApiSchema), out List schemas)) + if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas)) { var openApiSchemas = schemas.Cast().Distinct().ToList() .ToDictionary(k => k.Reference.Id); @@ -425,8 +425,8 @@ private static string ConvertByteArrayToString(byte[] hash) { // Build the final string by converting each byte // into hex and appending it to a StringBuilder - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < hash.Length; i++) + var sb = new StringBuilder(); + for (var i = 0; i < hash.Length; i++) { sb.Append(hash[i].ToString("X2")); } diff --git a/src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs b/src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs index 19e463e36..671157eeb 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiReferenceResolver.cs @@ -196,7 +196,7 @@ public override void Visit(OpenApiSchema schema) /// private void ResolveTags(IList tags) { - for (int i = 0; i < tags.Count; i++) + for (var i = 0; i < tags.Count; i++) { var tag = tags[i]; if (IsUnresolvedReference(tag)) @@ -229,7 +229,7 @@ private void ResolveTags(IList tags) { if (list == null) return; - for (int i = 0; i < list.Count; i++) + for (var i = 0; i < list.Count; i++) { var entity = list[i]; if (IsUnresolvedReference(entity)) diff --git a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs index 4811f647c..4022793d5 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiWalker.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiWalker.cs @@ -68,7 +68,7 @@ internal void Walk(IList tags) // Visit tags if (tags != null) { - for (int i = 0; i < tags.Count; i++) + for (var i = 0; i < tags.Count; i++) { Walk(i.ToString(), () => Walk(tags[i])); } @@ -246,7 +246,7 @@ internal void Walk(IList servers) // Visit Servers if (servers != null) { - for (int i = 0; i < servers.Count; i++) + for (var i = 0; i < servers.Count; i++) { Walk(i.ToString(), () => Walk(servers[i])); } @@ -515,7 +515,7 @@ internal void Walk(IList securityRequirements) if (securityRequirements != null) { - for (int i = 0; i < securityRequirements.Count; i++) + for (var i = 0; i < securityRequirements.Count; i++) { Walk(i.ToString(), () => Walk(securityRequirements[i])); } @@ -536,7 +536,7 @@ internal void Walk(IList parameters) if (parameters != null) { - for (int i = 0; i < parameters.Count; i++) + for (var i = 0; i < parameters.Count; i++) { Walk(i.ToString(), () => Walk(parameters[i])); } @@ -614,12 +614,9 @@ internal void Walk(OpenApiRequestBody requestBody, bool isComponent = false) _visitor.Visit(requestBody); - if (requestBody != null) + if (requestBody is {Content: not null}) { - if (requestBody.Content != null) - { - Walk(OpenApiConstants.Content, () => Walk(requestBody.Content)); - } + Walk(OpenApiConstants.Content, () => Walk(requestBody.Content)); } Walk(requestBody as IOpenApiExtensible); } @@ -879,7 +876,7 @@ internal void Walk(IList examples) // Visit Examples if (examples != null) { - for (int i = 0; i < examples.Count; i++) + for (var i = 0; i < examples.Count; i++) { Walk(i.ToString(), () => Walk(examples[i])); } @@ -899,7 +896,7 @@ internal void Walk(IList schemas) // Visit Schemas if (schemas != null) { - for (int i = 0; i < schemas.Count; i++) + for (var i = 0; i < schemas.Count; i++) { Walk(i.ToString(), () => Walk(schemas[i])); } diff --git a/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs b/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs index eda6e1a1d..c275458a5 100644 --- a/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs +++ b/src/Microsoft.OpenApi/Services/OpenApiWorkspace.cs @@ -72,7 +72,7 @@ public OpenApiWorkspace(OpenApiWorkspace workspace){} /// Returns true if a matching document is found. public bool Contains(string location) { - Uri key = ToLocationUrl(location); + var key = ToLocationUrl(location); return _documents.ContainsKey(key) || _fragments.ContainsKey(key) || _artifacts.ContainsKey(key); } diff --git a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs index 493341acf..a936766c8 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs @@ -45,7 +45,7 @@ public static class OpenApiSchemaRules if (schema.Enum != null) { - for (int i = 0; i < schema.Enum.Count; i++) + for (var i = 0; i < schema.Enum.Count; i++) { context.Enter(i.ToString()); RuleHelpers.ValidateDataTypeMismatch(context, nameof(SchemaMismatchedDataType), schema.Enum[i], schema); diff --git a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs index e777d0b04..ddf9dc0b4 100644 --- a/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs +++ b/src/Microsoft.OpenApi/Validations/Rules/RuleHelpers.cs @@ -121,7 +121,7 @@ public static void ValidateDataTypeMismatch( return; } - for (int i = 0; i < anyArray.Count; i++) + for (var i = 0; i < anyArray.Count; i++) { context.Enter(i.ToString()); diff --git a/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs b/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs index c1cf0a569..3f01ef549 100644 --- a/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs +++ b/src/Microsoft.OpenApi/Validations/ValidationExtensions.cs @@ -13,7 +13,7 @@ public static class ValidationContextExtensions /// public static void CreateError(this IValidationContext context, string ruleName, string message) { - OpenApiValidatorError error = new OpenApiValidatorError(ruleName, context.PathString, message); + var error = new OpenApiValidatorError(ruleName, context.PathString, message); context.AddError(error); } @@ -22,7 +22,7 @@ public static void CreateError(this IValidationContext context, string ruleName, /// public static void CreateWarning(this IValidationContext context, string ruleName, string message) { - OpenApiValidatorWarning warning = new OpenApiValidatorWarning(ruleName, context.PathString, message); + var warning = new OpenApiValidatorWarning(ruleName, context.PathString, message); context.AddWarning(warning); } } diff --git a/src/Microsoft.OpenApi/Validations/ValidationRule.cs b/src/Microsoft.OpenApi/Validations/ValidationRule.cs index 5c930de1b..733d5f725 100644 --- a/src/Microsoft.OpenApi/Validations/ValidationRule.cs +++ b/src/Microsoft.OpenApi/Validations/ValidationRule.cs @@ -62,7 +62,7 @@ internal override void Evaluate(IValidationContext context, object item) throw new ArgumentException(string.Format(SRResource.InputItemShouldBeType, typeof(T).FullName)); } - T typedItem = (T)item; + var typedItem = (T)item; this._validate(context, typedItem); } } diff --git a/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs b/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs index 7c93919e4..69ec17e11 100644 --- a/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs +++ b/src/Microsoft.OpenApi/Validations/ValidationRuleSet.cs @@ -83,7 +83,7 @@ public ValidationRuleSet(ValidationRuleSet ruleSet) return; } - foreach (ValidationRule rule in ruleSet) + foreach (var rule in ruleSet) { Add(rule); } @@ -100,7 +100,7 @@ public ValidationRuleSet(IEnumerable rules) return; } - foreach (ValidationRule rule in rules) + foreach (var rule in rules) { Add(rule); } @@ -163,10 +163,10 @@ IEnumerator IEnumerable.GetEnumerator() private static ValidationRuleSet BuildDefaultRuleSet() { - ValidationRuleSet ruleSet = new ValidationRuleSet(); - Type validationRuleType = typeof(ValidationRule); + var ruleSet = new ValidationRuleSet(); + var validationRuleType = typeof(ValidationRule); - IEnumerable rules = typeof(ValidationRuleSet).Assembly.GetTypes() + var rules = typeof(ValidationRuleSet).Assembly.GetTypes() .Where(t => t.IsClass && t != typeof(object) && t.GetCustomAttributes(typeof(OpenApiRuleAttribute), false).Any()) diff --git a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs index be8794941..20ed519ff 100644 --- a/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs +++ b/src/Microsoft.OpenApi/Writers/OpenApiYamlWriter.cs @@ -200,7 +200,7 @@ public override void WriteValue(string value) using (var reader = new StringReader(value)) { - bool firstLine = true; + var firstLine = true; while (reader.ReadLine() is var line && line != null) { if (firstLine) diff --git a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs index b2b6b6c9b..f588e4838 100644 --- a/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs +++ b/test/Microsoft.OpenApi.Hidi.Tests/Services/OpenApiServiceTests.cs @@ -208,7 +208,7 @@ public async Task ValidateCommandProcessesOpenApi() [Fact] public async Task TransformCommandConvertsOpenApi() { - HidiOptions options = new HidiOptions + var options = new HidiOptions { OpenApi = Path.Combine("UtilityFiles", "SampleOpenApi.yml"), Output = new("sample.json"), @@ -228,7 +228,7 @@ public async Task TransformCommandConvertsOpenApi() [Fact] public async Task TransformCommandConvertsOpenApiWithDefaultOutputName() { - HidiOptions options = new HidiOptions + var options = new HidiOptions { OpenApi = Path.Combine("UtilityFiles", "SampleOpenApi.yml"), CleanOutput = true, @@ -246,7 +246,7 @@ public async Task TransformCommandConvertsOpenApiWithDefaultOutputName() [Fact] public async Task TransformCommandConvertsCsdlWithDefaultOutputName() { - HidiOptions options = new HidiOptions + var options = new HidiOptions { Csdl = Path.Combine("UtilityFiles", "Todo.xml"), CleanOutput = true, @@ -264,7 +264,7 @@ public async Task TransformCommandConvertsCsdlWithDefaultOutputName() [Fact] public async Task TransformCommandConvertsOpenApiWithDefaultOutputNameAndSwitchFormat() { - HidiOptions options = new HidiOptions + var options = new HidiOptions { OpenApi = Path.Combine("UtilityFiles", "SampleOpenApi.yml"), CleanOutput = true, @@ -284,7 +284,7 @@ public async Task TransformCommandConvertsOpenApiWithDefaultOutputNameAndSwitchF [Fact] public Task ThrowTransformCommandIfOpenApiAndCsdlAreEmpty() { - HidiOptions options = new HidiOptions + var options = new HidiOptions { CleanOutput = true, TerseOutput = false, @@ -299,7 +299,7 @@ public Task ThrowTransformCommandIfOpenApiAndCsdlAreEmpty() public async Task TransformToPowerShellCompliantOpenApi() { var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "UtilityFiles", "examplepowershellsettings.json"); - HidiOptions options = new HidiOptions + var options = new HidiOptions { OpenApi = Path.Combine("UtilityFiles", "SampleOpenApi.yml"), CleanOutput = true, diff --git a/test/Microsoft.OpenApi.Readers.Tests/Resources.cs b/test/Microsoft.OpenApi.Readers.Tests/Resources.cs index 460e33710..431c86e04 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/Resources.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/Resources.cs @@ -15,7 +15,7 @@ internal static class Resources /// The file contents. public static string GetString(string fileName) { - using Stream stream = GetStream(fileName); + using var stream = GetStream(fileName); using TextReader reader = new StreamReader(stream); return reader.ReadToEnd(); } @@ -27,8 +27,8 @@ public static string GetString(string fileName) /// The file stream. public static Stream GetStream(string fileName) { - string path = GetPath(fileName); - Stream stream = typeof(Resources).Assembly.GetManifestResourceStream(path); + var path = GetPath(fileName); + var stream = typeof(Resources).Assembly.GetManifestResourceStream(path); if (stream == null) { diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs index 9e76f6491..3a1c86298 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs @@ -401,11 +401,11 @@ public void ShouldAssignSchemaToAllResponses() public void ShouldAllowComponentsThatJustContainAReference() { using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "ComponentRootReference.json")); - OpenApiStreamReader reader = new OpenApiStreamReader(); - OpenApiDocument doc = reader.Read(stream, out OpenApiDiagnostic diags); - OpenApiSchema schema1 = doc.Components.Schemas["AllPets"]; + var reader = new OpenApiStreamReader(); + var doc = reader.Read(stream, out var diags); + var schema1 = doc.Components.Schemas["AllPets"]; Assert.False(schema1.UnresolvedReference); - OpenApiSchema schema2 = doc.ResolveReferenceTo(schema1.Reference); + var schema2 = doc.ResolveReferenceTo(schema1.Reference); if (schema2.UnresolvedReference && schema1.Reference.Id == schema2.Reference.Id) { // detected a cycle - this code gets triggered @@ -418,7 +418,7 @@ public void ParseDocumentWithDefaultContentTypeSettingShouldSucceed() { using var stream = Resources.GetStream(Path.Combine(SampleFolderPath, "docWithEmptyProduces.yaml")); var doc = new OpenApiStreamReader(new() { DefaultContentType = new() { "application/json" } }) - .Read(stream, out OpenApiDiagnostic diags); + .Read(stream, out var diags); var mediaType = doc.Paths["/example"].Operations[OperationType.Get].Responses["200"].Content; Assert.Contains("application/json", mediaType); } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs index 4505ce33a..1f86ab895 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs @@ -38,7 +38,7 @@ public T Clone(T element) where T : IOpenApiSerializable using var streamReader = new StreamReader(stream); var result = streamReader.ReadToEnd(); - return new OpenApiStringReader().ReadFragment(result, OpenApiSpecVersion.OpenApi3_0, out OpenApiDiagnostic diagnostic4); + return new OpenApiStringReader().ReadFragment(result, OpenApiSpecVersion.OpenApi3_0, out var diagnostic4); } public OpenApiSecurityScheme CloneSecurityScheme(OpenApiSecurityScheme element) @@ -56,7 +56,7 @@ public OpenApiSecurityScheme CloneSecurityScheme(OpenApiSecurityScheme element) using var streamReader = new StreamReader(stream); var result = streamReader.ReadToEnd(); - return new OpenApiStringReader().ReadFragment(result, OpenApiSpecVersion.OpenApi3_0, out OpenApiDiagnostic diagnostic4); + return new OpenApiStringReader().ReadFragment(result, OpenApiSpecVersion.OpenApi3_0, out var diagnostic4); } [Fact] diff --git a/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs index 6e11be18f..b5f067580 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/BodyExpressionTests.cs @@ -34,8 +34,8 @@ public void BodyExpressionWorksWithDefaultConstructor() public void BodyExpressionConstructorCreateCorrectBodyExpression() { // Arrange - string expression = "#/user/uuid"; - JsonPointer pointer = new JsonPointer(expression); + var expression = "#/user/uuid"; + var pointer = new JsonPointer(expression); // Act var body = new BodyExpression(pointer); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs index abe1cf929..601387385 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/HeaderExpressionTests.cs @@ -27,7 +27,7 @@ public void HeaderExpressionConstructorThrows(string token) public void BodyExpressionWorksWithConstructor() { // Arrange - string expression = "accept"; + var expression = "accept"; // Act var header = new HeaderExpression(expression); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs index 3ff084f77..49438b5a5 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/PathExpressionTests.cs @@ -27,7 +27,7 @@ public void PathExpressionConstructorThrows(string name) public void PathExpressionConstructorWorks() { // Arrange - string name = "anyValue"; + var name = "anyValue"; // Act var path = new PathExpression(name); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs index e4d215496..1c025cfa3 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/QueryExpressionTests.cs @@ -27,7 +27,7 @@ public void QueryExpressionConstructorThrows(string name) public void QueryExpressionConstructorWorks() { // Arrange - string name = "anyValue"; + var name = "anyValue"; // Act var query = new QueryExpression(name); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs index ba74cbd92..4406485f1 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/RequestExpressionTests.cs @@ -24,10 +24,10 @@ public void RequestExpressionConstructorThrows() public void RequestExpressionConstructorWorks() { // Arrange - SourceExpression source = SourceExpression.Build("header.accept"); + var source = SourceExpression.Build("header.accept"); // Act - RequestExpression request = new RequestExpression(source); + var request = new RequestExpression(source); // Assert Assert.Same(source, request.Source); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs index a384d6cac..d20cdf7a7 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/ResponseExpressionTests.cs @@ -24,10 +24,10 @@ public void ResponseExpressionConstructorThrows() public void ResponseExpressionConstructorWorks() { // Arrange - SourceExpression source = SourceExpression.Build("header.accept"); + var source = SourceExpression.Build("header.accept"); // Act - ResponseExpression response = new ResponseExpression(source); + var response = new ResponseExpression(source); // Assert Assert.Same(source, response.Source); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs index 9b43b93ec..a60e2698a 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs @@ -38,7 +38,7 @@ public void BuildRuntimeExpressionThrowsInvalidFormat(string expression) Action test = () => RuntimeExpression.Build(expression); // Assert - OpenApiException exception = Assert.Throws(test); + var exception = Assert.Throws(test); Assert.Equal(String.Format(SRResource.RuntimeExpressionHasInvalidFormat, expression), exception.Message); } @@ -46,7 +46,7 @@ public void BuildRuntimeExpressionThrowsInvalidFormat(string expression) public void BuildMethodRuntimeExpressionReturnsMethodExpression() { // Arrange - string expression = "$method"; + var expression = "$method"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -61,7 +61,7 @@ public void BuildMethodRuntimeExpressionReturnsMethodExpression() public void BuildUrlRuntimeExpressionReturnsUrlExpression() { // Arrange - string expression = "$url"; + var expression = "$url"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -76,7 +76,7 @@ public void BuildUrlRuntimeExpressionReturnsUrlExpression() public void BuildStatusCodeRuntimeExpressionReturnsStatusCodeExpression() { // Arrange - string expression = "$statusCode"; + var expression = "$statusCode"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -91,7 +91,7 @@ public void BuildStatusCodeRuntimeExpressionReturnsStatusCodeExpression() public void BuildRequestRuntimeExpressionReturnsRequestExpression() { // Arrange - string expression = "$request.header.accept"; + var expression = "$request.header.accept"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -114,7 +114,7 @@ public void BuildRequestRuntimeExpressionReturnsRequestExpression() public void BuildResponseRuntimeExpressionReturnsResponseExpression() { // Arrange - string expression = "$response.body#/status"; + var expression = "$response.body#/status"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -153,7 +153,7 @@ public void BuildRuntimeExpressionTwiceCreatesNewEquivalentInstances(string expr public void CompositeRuntimeExpressionContainsExpression() { // Arrange - string expression = "This is a composite expression {$url} yay"; + var expression = "This is a composite expression {$url} yay"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -171,7 +171,7 @@ public void CompositeRuntimeExpressionContainsExpression() public void CompositeRuntimeExpressionContainsMultipleExpressions() { // Arrange - string expression = "This is a composite expression {$url} yay and {$request.header.foo}"; + var expression = "This is a composite expression {$url} yay and {$request.header.foo}"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -195,7 +195,7 @@ public void CompositeRuntimeExpressionContainsMultipleExpressions() public void CompositeRuntimeExpressionForWebHook() { // Arrange - string expression = "http://notificationServer.com?transactionId={$request.body#/id}&email={$request.body#/email}"; + var expression = "http://notificationServer.com?transactionId={$request.body#/id}&email={$request.body#/email}"; // Act var runtimeExpression = RuntimeExpression.Build(expression); @@ -216,7 +216,7 @@ public void CompositeRuntimeExpressionForWebHook() public void CompositeRuntimeExpressionWithMultipleRuntimeExpressionsAndFakeBraces() { // Arrange - string expression = "This is a composite expression {url} {test} and {} {$url} and {$request.header.foo}"; + var expression = "This is a composite expression {url} {test} and {} {$url} and {$request.header.foo}"; // Act var runtimeExpression = RuntimeExpression.Build(expression); diff --git a/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs index 12aaf47c5..5ed80bf6e 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/SourceExpressionTests.cs @@ -24,7 +24,7 @@ public void BuildSourceExpressionThrowsInvalidFormat(string expression) Action test = () => SourceExpression.Build(expression); // Assert - OpenApiException exception = Assert.Throws(test); + var exception = Assert.Throws(test); Assert.Equal(String.Format(SRResource.SourceExpressionHasInvalidFormat, expression), exception.Message); } @@ -32,7 +32,7 @@ public void BuildSourceExpressionThrowsInvalidFormat(string expression) public void BuildHeaderExpressionReturnsHeaderExpression() { // Arrange - string expression = "header.accept"; + var expression = "header.accept"; // Act var sourceExpression = SourceExpression.Build(expression); @@ -48,7 +48,7 @@ public void BuildHeaderExpressionReturnsHeaderExpression() public void BuildQueryExpressionReturnsQueryExpression() { // Arrange - string expression = "query.anyValue"; + var expression = "query.anyValue"; // Act var sourceExpression = SourceExpression.Build(expression); @@ -64,7 +64,7 @@ public void BuildQueryExpressionReturnsQueryExpression() public void BuildPathExpressionReturnsPathExpression() { // Arrange - string expression = "path.anyValue"; + var expression = "path.anyValue"; // Act var sourceExpression = SourceExpression.Build(expression); @@ -80,7 +80,7 @@ public void BuildPathExpressionReturnsPathExpression() public void BuildBodyExpressionReturnsBodyExpression() { // Arrange - string expression = "body#/user/uuid"; + var expression = "body#/user/uuid"; // Act var sourceExpression = SourceExpression.Build(expression); diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs index 5f4cd74fa..8f0a77160 100644 --- a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs +++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiDeprecationExtensionTests.cs @@ -13,8 +13,8 @@ public class OpenApiDeprecationExtensionTests public void ExtensionNameMatchesExpected() { // Act - string name = OpenApiDeprecationExtension.Name; - string expectedName = "x-ms-deprecation"; + var name = OpenApiDeprecationExtension.Name; + var expectedName = "x-ms-deprecation"; // Assert Assert.Equal(expectedName, name); @@ -30,7 +30,7 @@ public void WritesNothingWhenNoValues() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.Null(extension.Date); @@ -55,7 +55,7 @@ public void WritesAllValues() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.NotNull(extension.Date); diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs index 9c05a8e18..61868ff94 100644 --- a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs +++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumFlagsExtensionTests.cs @@ -13,8 +13,8 @@ public class OpenApiEnumFlagsExtensionTests public void ExtensionNameMatchesExpected() { // Act - string name = OpenApiEnumFlagsExtension.Name; - string expectedName = "x-ms-enum-flags"; + var name = OpenApiEnumFlagsExtension.Name; + var expectedName = "x-ms-enum-flags"; // Assert Assert.Equal(expectedName, name); @@ -30,7 +30,7 @@ public void WritesDefaultValues() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.Contains("\"isFlags\": false", result); @@ -51,7 +51,7 @@ public void WritesAllDefaultValues() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.Contains("\"isFlags\": true", result); @@ -71,7 +71,7 @@ public void WritesAllValues() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.True(extension.IsFlags); diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs index e8ea2fe07..3b9f9964a 100644 --- a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs +++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiEnumValuesDescriptionExtensionTests.cs @@ -11,8 +11,8 @@ public class OpenApiEnumValuesDescriptionExtensionTests public void ExtensionNameMatchesExpected() { // Act - string name = OpenApiEnumValuesDescriptionExtension.Name; - string expectedName = "x-ms-enum"; + var name = OpenApiEnumValuesDescriptionExtension.Name; + var expectedName = "x-ms-enum"; // Assert Assert.Equal(expectedName, name); @@ -27,7 +27,7 @@ public void WritesNothingWhenNoValues() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.Empty(extension.EnumName); @@ -55,7 +55,7 @@ public void WritesEnumDescription() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.Contains("values", result); diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs index cfbbf0a17..2eb362885 100644 --- a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs +++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPagingExtensionsTests.cs @@ -13,7 +13,7 @@ public class OpenApiPagingExtensionsTests public void ExtensionNameMatchesExpected() { // Act - string name = OpenApiPagingExtension.Name; + var name = OpenApiPagingExtension.Name; var expectedName = "x-ms-pageable"; // Assert diff --git a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs index 5ef75d8a9..9ea10df21 100644 --- a/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs +++ b/test/Microsoft.OpenApi.Tests/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtensionTests.cs @@ -16,8 +16,8 @@ public class OpenApiPrimaryErrorMessageExtensionTests public void ExtensionNameMatchesExpected() { // Act - string name = MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Name; - string expectedName = "x-ms-primary-error-message"; + var name = MicrosoftExtensions.OpenApiPrimaryErrorMessageExtension.Name; + var expectedName = "x-ms-primary-error-message"; // Assert Assert.Equal(expectedName, name); @@ -36,7 +36,7 @@ public void WritesValue() // Act extension.Write(writer, OpenApiSpecVersion.OpenApi3_0); - string result = sWriter.ToString(); + var result = sWriter.ToString(); // Assert Assert.True(extension.IsPrimaryErrorMessage); diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs index 1538aa2fb..ea0b98956 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs @@ -1655,7 +1655,7 @@ And reading in similar documents(one has a whitespace) yields the same hash code private static OpenApiDocument ParseInputFile(string filePath) { // Read in the input yaml file - using FileStream stream = File.OpenRead(filePath); + using var stream = File.OpenRead(filePath); var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic); return openApiDoc; diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs index 36ead6e72..4c962aaad 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs @@ -265,9 +265,9 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality() securityRequirement.Add(securityScheme1, new List()); securityRequirement.Add(securityScheme2, new List { "scope1", "scope2" }); - Action addSecurityScheme1Duplicate = () => + var addSecurityScheme1Duplicate = () => securityRequirement.Add(securityScheme1Duplicate, new List()); - Action addSecurityScheme1WithDifferentProperties = () => + var addSecurityScheme1WithDifferentProperties = () => securityRequirement.Add(securityScheme1WithDifferentProperties, new List()); // Assert diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs index c7ee7e692..94518ba0c 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiUrlTreeNodeTests.cs @@ -109,7 +109,7 @@ public void CreateMultiplePathsWorks() { var doc = OpenApiDocumentSample_1; - string label = "assets"; + var label = "assets"; var rootNode = OpenApiUrlTreeNode.Create(doc, label); Assert.NotNull(rootNode); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs index e4a24c308..f6ce92ead 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiComponentsValidationTests.cs @@ -20,7 +20,7 @@ public void ValidateKeyMustMatchRegularExpressionInComponents() // Arrange const string key = "%@abc"; - OpenApiComponents components = new OpenApiComponents + var components = new OpenApiComponents { Responses = new Dictionary { @@ -31,12 +31,12 @@ public void ValidateKeyMustMatchRegularExpressionInComponents() var errors = components.Validate(ValidationRuleSet.GetDefaultRuleSet()); // Act - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_ComponentsKeyMustMatchRegularExpr, key, "responses", OpenApiComponentsRules.KeyRegex.ToString()), error.Message); } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs index bf927297e..3ad7130ad 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiContactValidationTests.cs @@ -18,19 +18,19 @@ public void ValidateEmailFieldIsEmailAddressInContact() // Arrange const string testEmail = "support/example.com"; - OpenApiContact contact = new OpenApiContact + var contact = new OpenApiContact { Email = testEmail }; // Act var errors = contact.Validate(ValidationRuleSet.GetDefaultRuleSet()); - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_StringMustBeEmailAddress, testEmail), error.Message); } } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs index d5b404438..001e5da92 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiExternalDocsValidationTests.cs @@ -16,18 +16,18 @@ public class OpenApiExternalDocsValidationTests public void ValidateUrlIsRequiredInExternalDocs() { // Arrange - OpenApiExternalDocs externalDocs = new OpenApiExternalDocs(); + var externalDocs = new OpenApiExternalDocs(); // Act var errors = externalDocs.Validate(ValidationRuleSet.GetDefaultRuleSet()); // Assert - bool result = !errors.Any(); + var result = !errors.Any(); Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "url", "External Documentation"), error.Message); } } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs index b051c1a22..240b8b833 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiHeaderValidationTests.cs @@ -36,7 +36,7 @@ public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema() errors = validator.Errors; var warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -107,7 +107,7 @@ public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(header); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs index e67b3b116..95dde7942 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiInfoValidationTests.cs @@ -16,15 +16,15 @@ public class OpenApiInfoValidationTests public void ValidateFieldIsRequiredInInfo() { // Arrange - string titleError = String.Format(SRResource.Validation_FieldIsRequired, "title", "info"); - string versionError = String.Format(SRResource.Validation_FieldIsRequired, "version", "info"); + var titleError = String.Format(SRResource.Validation_FieldIsRequired, "title", "info"); + var versionError = String.Format(SRResource.Validation_FieldIsRequired, "version", "info"); var info = new OpenApiInfo(); // Act var errors = info.Validate(ValidationRuleSet.GetDefaultRuleSet()); // Assert - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs index 45bab5671..0f30b0580 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiLicenseValidationTests.cs @@ -18,7 +18,7 @@ public void ValidateFieldIsRequiredInLicense() { // Arrange IEnumerable errors; - OpenApiLicense license = new OpenApiLicense(); + var license = new OpenApiLicense(); // Act var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); @@ -26,12 +26,12 @@ public void ValidateFieldIsRequiredInLicense() walker.Walk(license); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "name", "license"), error.Message); } } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs index d33cb02da..550b01022 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiMediaTypeValidationTests.cs @@ -35,7 +35,7 @@ public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(mediaType); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -106,7 +106,7 @@ public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(mediaType); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs index 329727b2b..a49b3f9bb 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiOAuthFlowValidationTests.cs @@ -17,10 +17,10 @@ public class OpenApiOAuthFlowValidationTests public void ValidateFixedFieldsIsRequiredInResponse() { // Arrange - string authorizationUrlError = String.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow"); - string tokenUrlError = String.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow"); + var authorizationUrlError = String.Format(SRResource.Validation_FieldIsRequired, "authorizationUrl", "OAuth Flow"); + var tokenUrlError = String.Format(SRResource.Validation_FieldIsRequired, "tokenUrl", "OAuth Flow"); IEnumerable errors; - OpenApiOAuthFlow oAuthFlow = new OpenApiOAuthFlow(); + var oAuthFlow = new OpenApiOAuthFlow(); // Act var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); @@ -28,7 +28,7 @@ public void ValidateFixedFieldsIsRequiredInResponse() walker.Walk(oAuthFlow); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs index 27ea80c48..bc8f1a517 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs @@ -21,8 +21,8 @@ public class OpenApiParameterValidationTests public void ValidateFieldIsRequiredInParameter() { // Arrange - string nameError = String.Format(SRResource.Validation_FieldIsRequired, "name", "parameter"); - string inError = String.Format(SRResource.Validation_FieldIsRequired, "in", "parameter"); + var nameError = String.Format(SRResource.Validation_FieldIsRequired, "name", "parameter"); + var inError = String.Format(SRResource.Validation_FieldIsRequired, "in", "parameter"); var parameter = new OpenApiParameter(); // Act @@ -85,7 +85,7 @@ public void ValidateExampleShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(parameter); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -159,7 +159,7 @@ public void ValidateExamplesShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(parameter); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -203,7 +203,7 @@ public void PathParameterNotInThePathShouldReturnAnError() walker.Walk(parameter); errors = validator.Errors; - bool result = errors.Any(); + var result = errors.Any(); // Assert result.Should().BeTrue(); @@ -246,7 +246,7 @@ public void PathParameterInThePathShouldBeOk() walker.Walk(parameter); errors = validator.Errors; - bool result = errors.Any(); + var result = errors.Any(); // Assert result.Should().BeFalse(); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs index b145f9ab9..baa3032bc 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiReferenceValidationTests.cs @@ -28,7 +28,7 @@ public void ReferencedSchemaShouldOnlyBeValidatedOnce() UnresolvedReference = false }; - OpenApiDocument document = new OpenApiDocument(); + var document = new OpenApiDocument(); document.Components = new() { Schemas = new Dictionary @@ -84,7 +84,7 @@ public void UnresolvedReferenceSchemaShouldNotBeValidated() UnresolvedReference = true }; - OpenApiDocument document = new OpenApiDocument(); + var document = new OpenApiDocument(); document.Components = new() { Schemas = new Dictionary @@ -114,7 +114,7 @@ public void UnresolvedSchemaReferencedShouldNotBeValidated() UnresolvedReference = true }; - OpenApiDocument document = new OpenApiDocument(); + var document = new OpenApiDocument(); document.Paths = new() { diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs index a3a84af95..b967ebab6 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiResponseValidationTests.cs @@ -18,7 +18,7 @@ public void ValidateDescriptionIsRequiredInResponse() { // Arrange IEnumerable errors; - OpenApiResponse response = new OpenApiResponse(); + var response = new OpenApiResponse(); // Act var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); @@ -26,12 +26,12 @@ public void ValidateDescriptionIsRequiredInResponse() walker.Walk(response); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiValidatorError error = Assert.Single(errors) as OpenApiValidatorError; + var error = Assert.Single(errors) as OpenApiValidatorError; Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "description", "response"), error.Message); Assert.Equal("#/description", error.Pointer); } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs index bfe3706f1..7f3caa20a 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs @@ -34,7 +34,7 @@ public void ValidateDefaultShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(schema); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -66,7 +66,7 @@ public void ValidateExampleAndDefaultShouldNotHaveDataTypeMismatchForSimpleSchem walker.Walk(schema); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -121,7 +121,7 @@ public void ValidateEnumShouldNotHaveDataTypeMismatchForSimpleSchema() walker.Walk(schema); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -211,7 +211,7 @@ public void ValidateDefaultShouldNotHaveDataTypeMismatchForComplexSchema() walker.Walk(schema); warnings = validator.Warnings; - bool result = !warnings.Any(); + var result = !warnings.Any(); // Assert result.Should().BeFalse(); @@ -257,7 +257,7 @@ public void ValidateSchemaRequiredFieldListMustContainThePropertySpecifiedInTheD walker.Walk(components); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert result.Should().BeFalse(); diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs index 0cc6f9877..aa6d6ecd0 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiServerValidationTests.cs @@ -17,18 +17,18 @@ public void ValidateFieldIsRequiredInServer() { // Arrange IEnumerable errors; - OpenApiServer server = new OpenApiServer(); + var server = new OpenApiServer(); // Act var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); validator.Visit(server); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "url", "server"), error.Message); } } diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs index 7e530e6d2..b1362664f 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiTagValidationTests.cs @@ -19,18 +19,18 @@ public void ValidateNameIsRequiredInTag() { // Arrange IEnumerable errors; - OpenApiTag tag = new OpenApiTag(); + var tag = new OpenApiTag(); // Act var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); validator.Visit(tag); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_FieldIsRequired, "name", "tag"), error.Message); } @@ -39,7 +39,7 @@ public void ValidateExtensionNameStartsWithXDashInTag() { // Arrange IEnumerable errors; - OpenApiTag tag = new OpenApiTag + var tag = new OpenApiTag { Name = "tag" }; @@ -49,12 +49,12 @@ public void ValidateExtensionNameStartsWithXDashInTag() var validator = new OpenApiValidator(ValidationRuleSet.GetDefaultRuleSet()); validator.Visit(tag as IOpenApiExtensible); errors = validator.Errors; - bool result = !errors.Any(); + var result = !errors.Any(); // Assert Assert.False(result); Assert.NotNull(errors); - OpenApiError error = Assert.Single(errors); + var error = Assert.Single(errors); Assert.Equal(String.Format(SRResource.Validation_ExtensionNameMustBeginWithXDash, "tagExt", "#/extensions"), error.Message); } }