Fix time type matching and normalize all deprecation versions (#782) (#…

…783)

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit 3b526f7)

OpenSearch.sln.DotSettings

@@ -101,7 +101,7 @@
       </Entry.Match>
       <Entry.SortBy>
         <Kind Is="Member" />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="Fields">
@@ -116,7 +116,7 @@
       <Entry.SortBy>
         <Access />
         <Readonly />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="Constructors">
@@ -136,7 +136,7 @@
       </Entry.Match>
       <Entry.SortBy>
         <Access />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="Setup/Teardown Methods" Priority="100">
@@ -200,7 +200,7 @@
       </Entry.Match>
       <Entry.SortBy>
         <Kind Is="Member" />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="Fields">
@@ -215,7 +215,7 @@
       <Entry.SortBy>
         <Access />
         <Readonly />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="Constructors">
@@ -235,7 +235,7 @@
       </Entry.Match>
       <Entry.SortBy>
         <Access />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="Interface Implementations">
@@ -248,7 +248,7 @@
       <Entry.SortBy>
         <ImplementsInterface Name="IDisposable" />
         <Access />
-        <Name Is="Enter Pattern Here" />
+        <Name  />
       </Entry.SortBy>
     </Entry>
     <Entry DisplayName="All other members" />
@@ -501,6 +501,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/HighlightingManager/HighlightingEnabledByDefault/@EntryValue">False</s:Boolean>

src/ApiGenerator/Domain/Specification/Deprecation.cs

@@ -26,16 +26,18 @@
 *  under the License.
 */
 
+using SemanticVersioning;
+
 namespace ApiGenerator.Domain.Specification;
 
 public class Deprecation
 {
-	public string Version { get; set; }
+	public Version Version { get; set; }
 
 	public string Description { get; set; }
 
 	public override string ToString() =>
-		(!string.IsNullOrEmpty(Version), !string.IsNullOrEmpty(Description)) switch
+		(Version != null, !string.IsNullOrEmpty(Description)) switch
 		{
 			(true, true) => $"Deprecated as of: {Version}, reason: {Description}",
 			(true, false) => $"Deprecated as of: {Version}",

src/ApiGenerator/Generator/ApiEndpointFactory.cs

@@ -263,7 +263,7 @@ private static string GetOpenSearchType(JsonSchema schema, Action<string, bool>
             {
                 JsonObjectType.Integer => "number",
                 JsonObjectType.Array => "list",
-                JsonObjectType.String when schema.Pattern == "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$" => "time",
+                JsonObjectType.String when schema.Pattern == @"^([0-9\.]+)(?:d|h|m|s|ms|micros|nanos)$" => "time",
                 var t => t.ToString().ToLowerInvariant()
             };
         }
@@ -308,19 +308,24 @@ private static bool XGlobal(this OpenApiParameter parameter) =>
         private static string XDeprecationMessage(this IJsonExtensionObject schema) =>
             schema.GetExtension("x-deprecation-message") as string;
 
-        private static string XVersionDeprecated(this IJsonExtensionObject schema) =>
-            schema.GetExtension("x-version-deprecated") as string;
+        private static Version XVersionDeprecated(this IJsonExtensionObject schema) =>
+            schema.GetExtension("x-version-deprecated") is string s
+                ? CoerceVersion(s)
+                : null;
 
         private static Version XVersionAdded(this IJsonExtensionObject schema) =>
             schema.GetExtension("x-version-added") is string s
-                ? s.Split('.').Length switch
-                {
-                    1 => new Version($"{s}.0.0"),
-                    2 => new Version($"{s}.0"),
-                    _ => new Version(s),
-                }
+                ? CoerceVersion(s)
                 : null;
 
+        private static Version CoerceVersion(string s) =>
+            s.Split('.').Length switch
+            {
+                1 => new Version($"{s}.0.0"),
+                2 => new Version($"{s}.0"),
+                _ => new Version(s),
+            };
+
         private static object GetExtension(this IJsonExtensionObject schema, string key) =>
             schema.ExtensionData?.TryGetValue(key, out var value) ?? false ? value : null;
     }