Merge pull request #7048 from microsoft/dependabot/nuget/src/Kiota.Builder/multi-5812bfa265

Bump Microsoft.OpenApi and Microsoft.OpenApi.YamlReader

Author: baywet

src/Kiota.Builder/Kiota.Builder.csproj

@@ -39,9 +39,9 @@
     <PackageReference Include="DotNet.Glob" Version="3.1.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
     <PackageReference Include="Microsoft.Kiota.Bundle" Version="1.20.1" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.3.7" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview5" />
-    <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.0.0" />
+    <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.7" />
     <PackageReference Include="Microsoft.DeclarativeAgents.Manifest" Version="4.0.0-rc.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">

src/Kiota.Builder/KiotaBuilder.cs

@@ -1203,6 +1203,7 @@ openApiExtension is OpenApiPrimaryErrorMessageExtension primaryErrorMessageExten
             prop.SerializationName = childIdentifier;
         if (kind == CodePropertyKind.Custom &&
             propertySchema?.Default is JsonValue stringDefaultJsonValue &&
+            !stringDefaultJsonValue.IsJsonNullSentinel() &&
             stringDefaultJsonValue.TryGetValue<string>(out var stringDefaultValue) &&
             !string.IsNullOrEmpty(stringDefaultValue) &&
             !"null".Equals(stringDefaultValue, StringComparison.OrdinalIgnoreCase))

tests/Kiota.Builder.Tests/KiotaBuilderTests.cs

@@ -6873,6 +6873,84 @@ public void AddReservedPathParameterSymbol()
         Assert.Equal("{+baseurl}/users/{+id}/manager", managerUrlTemplate.DefaultValue.Trim('"'));
     }
     [Fact]
+    public void JsonNullSentinelIsNotDefaultValue()
+    {
+        // Given
+        var userSchema = new OpenApiSchema
+        {
+            Type = JsonSchemaType.Object,
+            Properties = new Dictionary<string, IOpenApiSchema> {
+                {
+                    "id", new OpenApiSchema {
+                        Type = JsonSchemaType.String
+                    }
+                },
+                {
+                    "displayName", new OpenApiSchema {
+                        Type = JsonSchemaType.String,
+                        Default = JsonNullSentinel.JsonNull
+                    }
+                }
+            },
+        };
+        var document = new OpenApiDocument
+        {
+            Paths = new OpenApiPaths
+            {
+                ["users/{id}/manager"] = new OpenApiPathItem
+                {
+                    Parameters = [
+                        new OpenApiParameter {
+                            Name = "id",
+                            In = ParameterLocation.Path,
+                            Required = true,
+                            Schema = new OpenApiSchema {
+                                Type = JsonSchemaType.String
+                            },
+                            Extensions = new Dictionary<string, IOpenApiExtension> (){
+                                ["x-ms-reserved-parameter"] = new OpenApiReservedParameterExtension {
+                                    IsReserved = true
+                                }
+                            }
+                        }
+                    ],
+                    Operations = new()
+                    {
+                        [NetHttpMethod.Get] = new OpenApiOperation
+                        {
+                            Responses = new OpenApiResponses
+                            {
+                                ["200"] = new OpenApiResponse
+                                {
+                                    Content = new Dictionary<string, OpenApiMediaType>()
+                                    {
+                                        ["application/json"] = new OpenApiMediaType
+                                        {
+                                            Schema = new OpenApiSchemaReference("microsoft.graph.user")
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+            },
+        };
+        document.AddComponent("microsoft.graph.user", userSchema);
+        document.SetReferenceHostDocument();
+        var mockLogger = new CountLogger<KiotaBuilder>();
+        var builder = new KiotaBuilder(mockLogger, new GenerationConfiguration { ClientClassName = "Graph", ApiRootUrl = "https://localhost" }, _httpClient);
+        var node = builder.CreateUriSpace(document);
+        var codeModel = builder.CreateSourceModel(node);
+        // When
+        var userModel = codeModel.FindChildByName<CodeClass>("User");
+        // Then
+        Assert.NotNull(userModel);
+        var displayNameProperty = userModel.FindChildByName<CodeProperty>("DisplayName", false);
+        Assert.NotNull(displayNameProperty);
+        Assert.Empty(displayNameProperty?.DefaultValue);
+    }
+    [Fact]
     public void DoesNotAddReservedPathParameterSymbol()
     {
         var userSchema = new OpenApiSchema