Cleanp

Author: Youssef1313

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -111,19 +111,12 @@ public string? ExclusiveMinimum
         /// <inheritdoc />
         public JsonSchemaType? Type { get; set; }
 
-        /// <summary>
-        /// This property is internal and is only used to mark the "nullable" state when doing deserialization.
-        /// It's only set during deserialization to flag whether we encountered "nullable" or not.
-        /// And it's read:
-        /// 1. During FinalizeDeserialization to determine whether the Type should be changed to include null or not.
-        /// 2. When serializing nullable, if IsNullable was false and IsNullableFromDeserialization was true, we will still serialize "nullable".
-        /// </summary>
-        internal bool IsNullableFromDeserialization { get; set; }
+        internal bool Nullable { get; set; }
 
-        // x-nullable is filtered out by deserializers, but keep the check here in case it gets added from user code.
-        internal bool IsNullable
-            => HasTrueNullableExtension || (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null));
+        private bool NullableOrHasNullType
+            => Nullable || (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null));
 
+        // x-nullable is filtered out by deserializers, but keep the check here in case it gets added from user code.
         private bool HasTrueNullableExtension
             => Extensions is not null &&
                 Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullExtRawValue) &&
@@ -802,16 +795,13 @@ internal void WriteAsItemsProperties(IOpenApiWriter writer)
 
         internal void FinalizeDeserialization(OpenApiSpecVersion version)
         {
-            if (version is OpenApiSpecVersion.OpenApi2_0)
+            if (version is OpenApiSpecVersion.OpenApi2_0 && HasTrueNullableExtension)
             {
-                if (HasTrueNullableExtension)
-                {
-                    Extensions!.Remove(OpenApiConstants.NullableExtension);
-                    IsNullableFromDeserialization = true;
-                }
+                Extensions!.Remove(OpenApiConstants.NullableExtension);
+                Nullable = true;
             }
 
-            if (IsNullableFromDeserialization && Type is not null && Type != 0)
+            if (Nullable && Type is not null && Type != 0)
             {
                 Type |= JsonSchemaType.Null;
             }
@@ -1031,7 +1021,7 @@ private bool TrySerializeTypeProperty(IOpenApiWriter writer, OpenApiSpecVersion
                     }
                     break;
                 default:
-                    WriteUnifiedSchemaType(IsNullable ? typeToUse.Value | JsonSchemaType.Null : typeToUse.Value, writer);
+                    WriteUnifiedSchemaType(typeToUse.Value, writer);
                     return true;
             }
 
@@ -1072,7 +1062,7 @@ where type.HasFlag(flag)
 
         private void SerializeNullable(IOpenApiWriter writer, OpenApiSpecVersion version, bool hasNullInComposition = false)
         {
-            if (IsNullable || IsNullableFromDeserialization || hasNullInComposition)
+            if (NullableOrHasNullType || hasNullInComposition)
             {
                 switch (version)
                 {

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

@@ -225,7 +225,7 @@ internal static partial class OpenApiV3Deserializer
                 {
                     if (bool.TryParse(n.GetScalarValue(), out var parsed) && parsed)
                     {
-                        o.IsNullableFromDeserialization = true;
+                        o.Nullable = true;
                     }
                 }
             },