Cleanup

Author: Youssef1313

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -114,11 +114,11 @@ public string? ExclusiveMinimum
         // x-nullable is filtered out by deserializers, but keep the check here in case it gets added from user code.
         internal bool IsNullable
         {
-            get => field || HasNullableExtension || (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null));
+            get => field || HasTrueNullableExtension || (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null));
             set => field = value;
         }
 
-        private bool HasNullableExtension
+        private bool HasTrueNullableExtension
             => Extensions is not null &&
                 Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullExtRawValue) &&
                 nullExtRawValue is JsonNodeExtension { Node: JsonNode jsonNode } &&
@@ -794,6 +794,20 @@ internal void WriteAsItemsProperties(IOpenApiWriter writer)
             writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi2_0);
         }
 
+        internal void FinalizeDeserialization()
+        {
+            if (HasTrueNullableExtension)
+            {
+                IsNullable = true;
+                Extensions!.Remove(OpenApiConstants.NullableExtension);
+            }
+
+            if (IsNullable && Type is not null && Type != 0)
+            {
+                Type |= JsonSchemaType.Null;
+            }
+        }
+
         private void WriteFormatProperty(IOpenApiWriter writer)
         {
             var formatToWrite = Format;

src/Microsoft.OpenApi/Reader/V2/OpenApiSchemaDeserializer.cs

@@ -268,17 +268,7 @@ public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocum
 
             ParseMap(jsonObject, schema, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context);
 
-            if (schema.Extensions is not null && schema.Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullableExtension))
-            {
-                var isNullable = nullableExtension is JsonNodeExtension { Node: JsonNode jsonNode } && jsonNode.GetValueKind() is JsonValueKind.True;
-                schema.IsNullable = isNullable;
-                schema.Extensions.Remove(OpenApiConstants.NullableExtension);
-            }
-
-            if (schema.IsNullable && schema.Type is not null && schema.Type != 0)
-            {
-                schema.Type |= JsonSchemaType.Null;
-            }
+            schema.FinalizeDeserialization();
 
             return schema;
         }

src/Microsoft.OpenApi/Reader/V3/OpenApiSchemaDeserializer.cs

@@ -385,17 +385,7 @@ public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocum
 
             ParseMap(jsonObject, schema, _openApiSchemaFixedFields, _openApiSchemaPatternFields, hostDocument, context);
 
-            if (schema.Extensions is not null && schema.Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullableExtension))
-            {
-                var isNullable = nullableExtension is JsonNodeExtension { Node: JsonNode jsonNode } && jsonNode.GetValueKind() is JsonValueKind.True;
-                schema.IsNullable = isNullable;
-                schema.Extensions.Remove(OpenApiConstants.NullableExtension);
-            }
-
-            if (schema.IsNullable && schema.Type is not null && schema.Type != 0)
-            {
-                schema.Type |= JsonSchemaType.Null;
-            }
+            schema.FinalizeDeserialization();
 
             return schema;
         }

src/Microsoft.OpenApi/Reader/V31/OpenApiSchemaDeserializer.cs

@@ -470,17 +470,7 @@ public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocum
                 schema.UnrecognizedKeywords[name] = value;
             });
 
-        if (schema.Extensions is not null && schema.Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullableExtension))
-        {
-            var isNullable = nullableExtension is JsonNodeExtension { Node: JsonNode jsonNode } && jsonNode.GetValueKind() is JsonValueKind.True;
-            schema.IsNullable = isNullable;
-            schema.Extensions.Remove(OpenApiConstants.NullableExtension);
-        }
-
-        if (schema.IsNullable && schema.Type is not null && schema.Type != 0)
-        {
-            schema.Type |= JsonSchemaType.Null;
-        }
+        schema.FinalizeDeserialization();
 
         if (!string.IsNullOrEmpty(identifier) && hostDocument.Workspace is not null)
         {

src/Microsoft.OpenApi/Reader/V32/OpenApiSchemaDeserializer.cs

@@ -470,17 +470,7 @@ public static IOpenApiSchema LoadSchema(JsonNode node, OpenApiDocument hostDocum
                 schema.UnrecognizedKeywords[name] = value;
             });
 
-        if (schema.Extensions is not null && schema.Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullableExtension))
-        {
-            var isNullable = nullableExtension is JsonNodeExtension { Node: JsonNode jsonNode } && jsonNode.GetValueKind() is JsonValueKind.True;
-            schema.IsNullable = isNullable;
-            schema.Extensions.Remove(OpenApiConstants.NullableExtension);
-        }
-
-        if (schema.IsNullable && schema.Type is not null && schema.Type != 0)
-        {
-            schema.Type |= JsonSchemaType.Null;
-        }
+        schema.FinalizeDeserialization();
 
         if (!string.IsNullOrEmpty(identifier) && hostDocument.Workspace is not null)
         {