chore: Merge remote-tracking branch 'origin/main' into fix/allow-implicit-conversion-for-openApiAny

Author: MaggieKimani1

README.md

@@ -55,7 +55,7 @@ var document = new OpenApiDocument
     {
         ["/pets"] = new OpenApiPathItem
         {
-            Operations = new Dictionary<HttpMethod, OpenApiOperation>
+            Operations = new()
             {
                 [HttpMethod.Get] = new OpenApiOperation
                 {

src/Microsoft.OpenApi.Hidi/Extensions/OpenApiExtensibleExtensions.cs

@@ -13,7 +13,7 @@ internal static class OpenApiExtensibleExtensions
         /// <param name="extensions">A dictionary of <see cref="IOpenApiExtension"/>.</param>
         /// <param name="extensionKey">The key corresponding to the <see cref="IOpenApiExtension"/>.</param>
         /// <returns>A <see cref="string"/> value matching the provided extensionKey. Return null when extensionKey is not found. </returns>
-        internal static string GetExtension(this IDictionary<string, IOpenApiExtension> extensions, string extensionKey)
+        internal static string GetExtension(this Dictionary<string, IOpenApiExtension> extensions, string extensionKey)
         {
             if (extensions.TryGetValue(extensionKey, out var value) && value is OpenApiAny { Node: JsonValue castValue } && castValue.TryGetValue<string>(out var stringValue))
             {

src/Microsoft.OpenApi.Hidi/Extensions/StringExtensions.cs

@@ -34,7 +34,7 @@ public static bool IsEquals(this string? target, string? searchValue, StringComp
         /// <param name="target">The target string to split by char. </param>
         /// <param name="separator">The char separator.</param>
         /// <returns>An <see cref="IList{String}"/> containing substrings.</returns>
-        public static IList<string> SplitByChar(this string target, char separator)
+        public static List<string> SplitByChar(this string target, char separator)
         {
             if (string.IsNullOrWhiteSpace(target))
             {

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -77,7 +77,7 @@ public override void Visit(OpenApiOperation operation)
             // Order matters. Resolve operationId.
             operationId = RemoveHashSuffix(operationId);
             if (operationTypeExtension.IsEquals("action") || operationTypeExtension.IsEquals("function"))
-                operationId = RemoveKeyTypeSegment(operationId, operation.Parameters ?? new List<IOpenApiParameter>());
+                operationId = RemoveKeyTypeSegment(operationId, operation.Parameters ?? []);
             operationId = SingularizeAndDeduplicateOperationId(operationId.SplitByChar('.'));
             operationId = ResolveODataCastOperationId(operationId);
             operationId = ResolveByRefOperationId(operationId);
@@ -119,7 +119,7 @@ private static string ResolveODataCastOperationId(string operationId)
             return match.Success ? $"{match.Groups[1]}{match.Groups[2]}" : operationId;
         }
 
-        private static string SingularizeAndDeduplicateOperationId(IList<string> operationIdSegments)
+        private static string SingularizeAndDeduplicateOperationId(List<string> operationIdSegments)
         {
             var segmentsCount = operationIdSegments.Count;
             var lastSegmentIndex = segmentsCount - 1;
@@ -145,7 +145,7 @@ private static string RemoveHashSuffix(string operationId)
             return s_hashSuffixRegex.Match(operationId).Value;
         }
 
-        private static string RemoveKeyTypeSegment(string operationId, IList<IOpenApiParameter> parameters)
+        private static string RemoveKeyTypeSegment(string operationId, List<IOpenApiParameter> parameters)
         {
             var segments = operationId.SplitByChar('.');
             foreach (var parameter in parameters)
@@ -159,9 +159,9 @@ private static string RemoveKeyTypeSegment(string operationId, IList<IOpenApiPar
             return string.Join('.', segments);
         }
 
-        private static void ResolveFunctionParameters(IList<IOpenApiParameter> parameters)
+        private static void ResolveFunctionParameters(List<IOpenApiParameter> parameters)
         {
-            foreach (var parameter in parameters.OfType<OpenApiParameter>().Where(static p => p.Content?.Any() ?? false))
+            foreach (var parameter in parameters.OfType<OpenApiParameter>().Where(static p => p.Content?.Count > 0))
             {
                 // Replace content with a schema object of type array
                 // for structured or collection-valued function parameters

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

@@ -29,7 +29,7 @@
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.2" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">

src/Microsoft.OpenApi.Hidi/StatsVisitor.cs

@@ -27,7 +27,7 @@ public override void Visit(IOpenApiSchema schema)
 
         public int HeaderCount { get; set; }
 
-        public override void Visit(IDictionary<string, IOpenApiHeader> headers)
+        public override void Visit(Dictionary<string, IOpenApiHeader> headers)
         {
             HeaderCount++;
         }

src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

@@ -13,7 +13,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.4" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Themes\Metro\HowToApplyTheme.txt" />

src/Microsoft.OpenApi.Workbench/StatsVisitor.cs

@@ -27,7 +27,7 @@ public override void Visit(IOpenApiSchema schema)
 
         public int HeaderCount { get; set; }
 
-        public override void Visit(IDictionary<string, IOpenApiHeader> headers)
+        public override void Visit(Dictionary<string, IOpenApiHeader> headers)
         {
             HeaderCount++;
         }

src/Microsoft.OpenApi.YamlReader/OpenApiYamlReader.cs

@@ -26,25 +26,27 @@ public class OpenApiYamlReader : IOpenApiReader
 
         /// <inheritdoc/>
         public async Task<ReadResult> ReadAsync(Stream input,
+                                                Uri location,
                                                 OpenApiReaderSettings settings,
                                                 CancellationToken cancellationToken = default)
         {
             if (input is null) throw new ArgumentNullException(nameof(input));
             if (input is MemoryStream memoryStream)
             {
-                return Read(memoryStream, settings);
+                return Read(memoryStream, location, settings);
             } 
             else 
             {
                 using var preparedStream = new MemoryStream();
                 await input.CopyToAsync(preparedStream, copyBufferSize, cancellationToken).ConfigureAwait(false);
                 preparedStream.Position = 0;
-                return Read(preparedStream, settings);
+                return Read(preparedStream, location, settings);
             }
         }
 
         /// <inheritdoc/>
         public ReadResult Read(MemoryStream input,
+                               Uri location,
                                OpenApiReaderSettings settings)
         {
             if (input is null) throw new ArgumentNullException(nameof(input));
@@ -74,13 +76,13 @@ public ReadResult Read(MemoryStream input,
                 };
             }
 
-            return Read(jsonNode, settings);
+            return Read(jsonNode, location, settings);
         }
 
         /// <inheritdoc/>
-        public static ReadResult Read(JsonNode jsonNode, OpenApiReaderSettings settings)
+        public static ReadResult Read(JsonNode jsonNode, Uri location, OpenApiReaderSettings settings)
         {
-            return _jsonReader.Read(jsonNode, settings);
+            return _jsonReader.Read(jsonNode, location, settings);
         }
 
         /// <inheritdoc/>

src/Microsoft.OpenApi/Extensions/OpenApiExtensibleExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 using System;
+using System.Collections.Generic;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
@@ -32,10 +33,8 @@ public static void AddExtension<T>(this T element, string name, IOpenApiExtensio
                 throw new OpenApiException(string.Format(SRResource.ExtensionFieldNameMustBeginWithXDash, name));
             }
 
-            if (element.Extensions is not null)
-            {
-                element.Extensions[name] = Utils.CheckArgumentNull(any);
-            }            
+            element.Extensions ??= [];
+            element.Extensions[name] = Utils.CheckArgumentNull(any);
         }
     }
 }