Merge pull request #1873 from microsoft/vnext

irvinesunday · web-flow · commit 97f84500cae5 · 2024-10-14T10:45:01.000+03:00
Released Hidi
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @irvinesunday @darrelmiller @zengin @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman
+* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman
diff --git a/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
@@ -9,7 +9,7 @@
     <Nullable>enable</Nullable>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.4.11</Version>
+    <Version>1.4.12</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <SignAssembly>true</SignAssembly>
     <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
@@ -29,23 +29,23 @@
 
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.0.2" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.3" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.5" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.0-preview" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
     <!--STJ
     required until Microsoft.Extensions.Logging.Console and Microsoft.Extensions.Configuration.Json
     update their dependencies -->
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.10" />
     <!-- Microsoft.Windows.Compatibility 8.0.8 depends on 8.0.0 this dependency can be removed once they update theirs -->
     <PackageReference Include="System.Formats.Asn1" Version="8.0.1" />
   </ItemGroup>
diff --git a/src/Microsoft.OpenApi/Extensions/StringExtensions.cs b/src/Microsoft.OpenApi/Extensions/StringExtensions.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
-
 using System;
+using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using Microsoft.OpenApi.Attributes;
@@ -13,6 +13,8 @@ namespace Microsoft.OpenApi.Extensions
     /// </summary>
     public static class StringExtensions
     {
+        private static readonly ConcurrentDictionary<Type, ConcurrentDictionary<string, object>> EnumDisplayCache = new();
+
         /// <summary>
         /// Gets the enum value based on the given enum type and display name.
         /// </summary>
@@ -21,22 +23,28 @@ public static class StringExtensions
         {
             var type = typeof(T);
             if (!type.IsEnum)
-            {
                 return default;
-            }
+
+            var displayMap = EnumDisplayCache.GetOrAdd(type, _ => new ConcurrentDictionary<string, object>(StringComparer.OrdinalIgnoreCase));
+
+            if (displayMap.TryGetValue(displayName, out var cachedValue))
+                return (T)cachedValue;
+
 
             foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.Static))
             {
-                var displayAttribute = (DisplayAttribute)field.GetCustomAttribute(typeof(DisplayAttribute));
-                if (displayAttribute != null && displayAttribute.Name == displayName)
+                var displayAttribute = field.GetCustomAttribute<DisplayAttribute>();
+                if (displayAttribute != null && displayAttribute.Name.Equals(displayName, StringComparison.OrdinalIgnoreCase))
                 {
-                    return (T)field.GetValue(null);
+                    var enumValue = (T)field.GetValue(null);
+                    displayMap.TryAdd(displayName, enumValue);
+                    return enumValue;
                 }
             }
 
             return default;
         }
         internal static string ToFirstCharacterLowerCase(this string input)
-        => string.IsNullOrEmpty(input) ? string.Empty : char.ToLowerInvariant(input[0]) + input.Substring(1);
+            => string.IsNullOrEmpty(input) ? string.Empty : char.ToLowerInvariant(input[0]) + input.Substring(1);
     }
 }
diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
@@ -24,7 +24,7 @@
         <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
         <!--STJ required until Microsoft.Extensions.Logging.Console and Microsoft.Extensions.Configuration.Json update their dependencies -->
-        <PackageReference Include="System.Text.Json" Version="8.0.4" />
+        <PackageReference Include="System.Text.Json" Version="8.0.5" />
     </ItemGroup>
 
     <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @irvinesunday @darrelmiller @zengin @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman`
	`1`	`+* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license.`
`3`		`-`
`4`	`3`	`using System;`
	`4`	`+using System.Collections.Concurrent;`
`5`	`5`	`using System.Diagnostics.CodeAnalysis;`
`6`	`6`	`using System.Reflection;`
`7`	`7`	`using Microsoft.OpenApi.Attributes;`
`@@ -13,6 +13,8 @@ namespace Microsoft.OpenApi.Extensions`
`13`	`13`	`/// </summary>`
`14`	`14`	`public static class StringExtensions`
`15`	`15`	`{`
	`16`	`+ private static readonly ConcurrentDictionary<Type, ConcurrentDictionary<string, object>> EnumDisplayCache = new();`
	`17`	`+`
`16`	`18`	`/// <summary>`
`17`	`19`	`/// Gets the enum value based on the given enum type and display name.`
`18`	`20`	`/// </summary>`
`@@ -21,22 +23,28 @@ public static class StringExtensions`
`21`	`23`	`{`
`22`	`24`	`var type = typeof(T);`
`23`	`25`	`if (!type.IsEnum)`
`24`		`- {`
`25`	`26`	`return default;`
`26`		`- }`
	`27`	`+`
	`28`	`+ var displayMap = EnumDisplayCache.GetOrAdd(type, _ => new ConcurrentDictionary<string, object>(StringComparer.OrdinalIgnoreCase));`
	`29`	`+`
	`30`	`+ if (displayMap.TryGetValue(displayName, out var cachedValue))`
	`31`	`+ return (T)cachedValue;`
	`32`	`+`
`27`	`33`
`28`	`34`	`foreach (var field in type.GetFields(BindingFlags.Public \| BindingFlags.Static))`
`29`	`35`	`{`
`30`		`- var displayAttribute = (DisplayAttribute)field.GetCustomAttribute(typeof(DisplayAttribute));`
`31`		`- if (displayAttribute != null && displayAttribute.Name == displayName)`
	`36`	`+ var displayAttribute = field.GetCustomAttribute<DisplayAttribute>();`
	`37`	`+ if (displayAttribute != null && displayAttribute.Name.Equals(displayName, StringComparison.OrdinalIgnoreCase))`
`32`	`38`	`{`
`33`		`- return (T)field.GetValue(null);`
	`39`	`+ var enumValue = (T)field.GetValue(null);`
	`40`	`+ displayMap.TryAdd(displayName, enumValue);`
	`41`	`+ return enumValue;`
`34`	`42`	`}`
`35`	`43`	`}`
`36`	`44`
`37`	`45`	`return default;`
`38`	`46`	`}`
`39`	`47`	`internal static string ToFirstCharacterLowerCase(this string input)`
`40`		`- => string.IsNullOrEmpty(input) ? string.Empty : char.ToLowerInvariant(input[0]) + input.Substring(1);`
	`48`	`+ => string.IsNullOrEmpty(input) ? string.Empty : char.ToLowerInvariant(input[0]) + input.Substring(1);`
`41`	`49`	`}`
`42`	`50`	`}`