chore/upgrade oainet

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Fixed a bug where path items with a trailing slash would cause collisions, missing query parameters and more.
 - Fixed a bug where path items with a trailing slash would be missing query parameters. [#6569](https://github.com/microsoft/kiota/issues/6569)
 - Fixed an issue where migration from lock to workspace would fail because of stream management. [#6515](https://github.com/microsoft/kiota/issues/6515)
 

src/Kiota.Builder/Constants.cs

@@ -1,6 +1,8 @@
 namespace Kiota.Builder;
+
 public static class Constants
 {
     public const string DefaultOpenApiLabel = "default";
     public const string TempDirectoryName = "kiota";
+    internal const string KiotaSegmentNameTreeNodeExtensionKey = "x-ms-kiota-new-segment-name";
 }

src/Kiota.Builder/Extensions/OpenApiDeprecationExtensionExtensions.cs

@@ -34,7 +34,7 @@ internal static DeprecationInformation GetDeprecationInformation(this OpenApiOpe
         if (operation.Deprecated && operation.Extensions is not null && operation.Extensions.TryGetValue(OpenApiDeprecationExtension.Name, out var deprecatedExtension) && deprecatedExtension is OpenApiDeprecationExtension deprecatedValue)
             return deprecatedValue.ToDeprecationInformation();
         else if (operation.Responses?.Values
-                                .SelectMany(static x => x.Content?.Values ?? [])
+                                .SelectMany(static x => x.Content?.Values.Select(static x => x) ?? [])
                                 .Select(static x => x?.Schema)
                                 .OfType<OpenApiSchema>()
                                 .Select(static x => x.GetDeprecationInformation())

src/Kiota.Builder/Extensions/OpenApiSchemaExtensions.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text.Json;
 using Kiota.Builder.OpenApiExtensions;
+using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
@@ -198,7 +199,7 @@ private static OpenApiSchema GetSchemaOrTargetShallowCopy(this IOpenApiSchema? s
             {
                 if (string.IsNullOrEmpty(result.Discriminator.PropertyName) && !string.IsNullOrEmpty(discriminator.PropertyName))
                     result.Discriminator.PropertyName = discriminator.PropertyName;
-                if (discriminator.Mapping?.Any() ?? false)
+                if (discriminator.Mapping is { Count: > 0 })
                     result.Discriminator.Mapping = discriminator.Mapping.ToDictionary(static x => x.Key, static x => x.Value);
             }
 
@@ -218,7 +219,8 @@ private static OpenApiSchema GetSchemaOrTargetShallowCopy(this IOpenApiSchema? s
     /// <param name="result">Resulting merged schema.</param>
     private static void AddOriginalReferenceIdExtension(this IOpenApiSchema schema, OpenApiSchema result)
     {
-        if (schema is not OpenApiSchemaReference schemaReference || string.IsNullOrEmpty(schemaReference.Reference.Id) || result.Extensions is null) return;
+        if (schema is not OpenApiSchemaReference schemaReference || string.IsNullOrEmpty(schemaReference.Reference.Id)) return;
+        result.Extensions ??= new Dictionary<string, IOpenApiExtension>(StringComparer.Ordinal);
         result.Extensions.TryAdd(OpenApiKiotaMergedExtension.Name, new OpenApiKiotaMergedExtension(schemaReference.Reference.Id));
     }
 
@@ -272,13 +274,13 @@ private static bool IsODataPrimitiveTypeBackwardCompatible(this IOpenApiSchema s
     {
         return schema.IsExclusiveUnion() &&
                 schema.OneOf is { Count: 3 } &&
-                schema.OneOf.Count(static x => x.Enum?.Any() ?? false) == 1 &&
+                schema.OneOf.Count(static x => x.Enum is { Count: > 0 }) == 1 &&
                 schema.OneOf.Count(isODataType) == 1 &&
                 schema.OneOf.Count(isStringType) == 1
                 ||
             schema.IsInclusiveUnion() &&
                 schema.AnyOf is { Count: 3 } &&
-                schema.AnyOf.Count(static x => x.Enum?.Any() ?? false) == 1 &&
+                schema.AnyOf.Count(static x => x.Enum is { Count: > 0 }) == 1 &&
                 schema.AnyOf.Count(isODataType) == 1 &&
                 schema.AnyOf.Count(isStringType) == 1;
     }
@@ -287,13 +289,13 @@ public static bool IsODataPrimitiveType(this IOpenApiSchema schema)
         if (schema is null) return false;
         return schema.IsExclusiveUnion() &&
                schema.OneOf is { Count: 3 } &&
-               schema.OneOf.Count(static x => isStringType(x) && (x.Enum?.Any() ?? false)) == 1 &&
+               schema.OneOf.Count(static x => isStringType(x) && (x.Enum is { Count: > 0 })) == 1 &&
                schema.OneOf.Count(isODataType) == 1 &&
                schema.OneOf.Count(isStringType) == 2
                ||
                schema.IsInclusiveUnion() &&
                schema.AnyOf is { Count: 3 } &&
-               schema.AnyOf.Count(static x => isStringType(x) && (x.Enum?.Any() ?? false)) == 1 &&
+               schema.AnyOf.Count(static x => isStringType(x) && (x.Enum is { Count: > 0 })) == 1 &&
                schema.AnyOf.Count(isODataType) == 1 &&
                schema.AnyOf.Count(isStringType) == 2
                ||
@@ -411,14 +413,14 @@ internal static IEnumerable<KeyValuePair<string, string>> GetDiscriminatorMappin
     {
         if (schema == null)
             return [];
-        if (!(schema.Discriminator?.Mapping?.Any() ?? false))
+        if (schema.Discriminator?.Mapping is not { Count: > 0 })
             if (schema.OneOf is { Count: > 0 })
                 return schema.OneOf.SelectMany(x => GetDiscriminatorMappings(x, inheritanceIndex));
             else if (schema.AnyOf is { Count: > 0 })
                 return schema.AnyOf.SelectMany(x => GetDiscriminatorMappings(x, inheritanceIndex));
-            else if ((schema.AllOf?.Any(allOfEvaluatorForMappings) ?? false) && schema.AllOf[^1].Equals(schema.AllOf.Last(allOfEvaluatorForMappings)))
-                // ensure the matched AllOf entry is the last in the list
-                return GetDiscriminatorMappings(schema.AllOf.Last(allOfEvaluatorForMappings), inheritanceIndex);
+            else if (schema.IsInherited() && schema.AllOf?.OfType<OpenApiSchema>().FirstOrDefault(allOfEvaluatorForMappings) is { } allOfEntry)
+                // ensure we're in an inheritance context and get the discriminator from the parent when available
+                return GetDiscriminatorMappings(allOfEntry, inheritanceIndex);
             else if (schema.GetReferenceId() is string refId && !string.IsNullOrEmpty(refId))
                 return GetAllInheritanceSchemaReferences(refId, inheritanceIndex)
                            .Where(static x => !string.IsNullOrEmpty(x))
@@ -428,9 +430,11 @@ internal static IEnumerable<KeyValuePair<string, string>> GetDiscriminatorMappin
                 return [];
 
         return schema.Discriminator
-                .Mapping;
+                .Mapping
+                .Where(static x => !string.IsNullOrEmpty(x.Value.Reference.Id))
+                .Select(static x => KeyValuePair.Create(x.Key, x.Value.Reference.Id!));
     }
-    private static readonly Func<IOpenApiSchema, bool> allOfEvaluatorForMappings = static x => x.Discriminator?.Mapping?.Any() ?? false;
+    private static readonly Func<IOpenApiSchema, bool> allOfEvaluatorForMappings = static x => x.Discriminator?.Mapping is { Count: > 0 };
     private static IEnumerable<string> GetAllInheritanceSchemaReferences(string currentReferenceId, ConcurrentDictionary<string, ConcurrentDictionary<string, bool>> inheritanceIndex)
     {
         ArgumentException.ThrowIfNullOrEmpty(currentReferenceId);