fix(library): use version-specific schema keyword callbacks

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: baywet

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -451,7 +451,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
 
             if (version >= OpenApiSpecVersion.OpenApi3_1)
             {
-                WriteJsonSchemaKeywords(writer);
+                WriteJsonSchemaKeywords(writer, callback);
             }
 
             // title
@@ -652,14 +652,14 @@ public virtual void SerializeAsV2(IOpenApiWriter writer)
             SerializeAsV2(writer: writer, parentRequiredProperties: new HashSet<string>(), propertyName: null);
         }
 
-        internal void WriteJsonSchemaKeywords(IOpenApiWriter writer)
+        internal void WriteJsonSchemaKeywords(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback)
         {
             writer.WriteProperty(OpenApiConstants.Id, Id);
             writer.WriteProperty(OpenApiConstants.DollarSchema, Schema?.ToString());
             writer.WriteProperty(OpenApiConstants.Comment, Comment);
             writer.WriteProperty(OpenApiConstants.Const, Const);
             writer.WriteOptionalMap(OpenApiConstants.Vocabulary, Vocabulary, (w, s) => w.WriteValue(s));
-            writer.WriteOptionalMap(OpenApiConstants.Defs, Definitions, (w, s) => s.SerializeAsV31(w));
+            writer.WriteOptionalMap(OpenApiConstants.Defs, Definitions, callback);
             writer.WriteProperty(OpenApiConstants.Anchor, Anchor);
             writer.WriteProperty(OpenApiConstants.DynamicRef, DynamicRef);
             writer.WriteProperty(OpenApiConstants.DynamicAnchor, DynamicAnchor);
@@ -674,24 +674,24 @@ internal void WriteJsonSchemaKeywords(IOpenApiWriter writer)
                     writer.WriteOptionalObject(
                         OpenApiConstants.UnevaluatedProperties,
                         UnevaluatedPropertiesSchema,
-                        (w, s) => s.SerializeAsV31(w));
+                        callback);
                 }
                 else if (!UnevaluatedProperties)
                 {
                     writer.WriteProperty(OpenApiConstants.UnevaluatedProperties, UnevaluatedProperties);
                 }
             }
             writer.WriteOptionalCollection(OpenApiConstants.Examples, Examples, (nodeWriter, s) => nodeWriter.WriteAny(s));
-            writer.WriteOptionalMap(OpenApiConstants.PatternProperties, PatternProperties, (w, s) => s.SerializeAsV31(w));
+            writer.WriteOptionalMap(OpenApiConstants.PatternProperties, PatternProperties, callback);
             writer.WriteOptionalMap(OpenApiConstants.DependentRequired, DependentRequired, (w, s) => w.WriteValue(s));
             writer.WriteProperty(OpenApiConstants.ContentEncoding, ContentEncoding);
             writer.WriteProperty(OpenApiConstants.ContentMediaType, ContentMediaType);
-            writer.WriteOptionalObject(OpenApiConstants.ContentSchema, ContentSchema, (w, s) => s.SerializeAsV31(w));
-            writer.WriteOptionalObject(OpenApiConstants.PropertyNames, PropertyNames, (w, s) => s.SerializeAsV31(w));
-            writer.WriteOptionalMap(OpenApiConstants.DependentSchemas, DependentSchemas, (w, s) => s.SerializeAsV31(w));
-            writer.WriteOptionalObject(OpenApiConstants.If, If, (w, s) => s.SerializeAsV31(w));
-            writer.WriteOptionalObject(OpenApiConstants.Then, Then, (w, s) => s.SerializeAsV31(w));
-            writer.WriteOptionalObject(OpenApiConstants.Else, Else, (w, s) => s.SerializeAsV31(w));
+            writer.WriteOptionalObject(OpenApiConstants.ContentSchema, ContentSchema, callback);
+            writer.WriteOptionalObject(OpenApiConstants.PropertyNames, PropertyNames, callback);
+            writer.WriteOptionalMap(OpenApiConstants.DependentSchemas, DependentSchemas, callback);
+            writer.WriteOptionalObject(OpenApiConstants.If, If, callback);
+            writer.WriteOptionalObject(OpenApiConstants.Then, Then, callback);
+            writer.WriteOptionalObject(OpenApiConstants.Else, Else, callback);
         }
 
         private void WriteV3CompatibilityKeywords(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback)

test/Microsoft.OpenApi.Tests/Mocks/OpenApiSchemaSerializationTests.cs

@@ -45,5 +45,37 @@ public void SerializeAsV3_DoesNotCallV31OrV2Serialization()
             _xmlMock.Verify(c => c.SerializeAsV2(It.IsAny<IOpenApiWriter>()), Times.Never, "V2 method should not be called");
             _xmlMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never, "V31 method should not be called");
         }
+
+        [Fact]
+        public void SerializeAsV31_UsesV31CallbackForJsonSchemaKeywords()
+        {
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+            var childSchemaMock = new Mock<OpenApiSchema> { CallBase = true };
+            childSchemaMock.Object.Type = JsonSchemaType.String;
+            _schema.ContentSchema = childSchemaMock.Object;
+
+            _schema.SerializeAsV31(writer);
+
+            childSchemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.AtLeastOnce);
+            childSchemaMock.Verify(c => c.SerializeAsV32(It.IsAny<IOpenApiWriter>()), Times.Never);
+            childSchemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
+
+        [Fact]
+        public void SerializeAsV32_UsesV32CallbackForJsonSchemaKeywords()
+        {
+            using var stringWriter = new StringWriter();
+            var writer = new OpenApiJsonWriter(stringWriter);
+            var childSchemaMock = new Mock<OpenApiSchema> { CallBase = true };
+            childSchemaMock.Object.Type = JsonSchemaType.String;
+            _schema.ContentSchema = childSchemaMock.Object;
+
+            _schema.SerializeAsV32(writer);
+
+            childSchemaMock.Verify(c => c.SerializeAsV32(It.IsAny<IOpenApiWriter>()), Times.AtLeastOnce);
+            childSchemaMock.Verify(c => c.SerializeAsV31(It.IsAny<IOpenApiWriter>()), Times.Never);
+            childSchemaMock.Verify(c => c.SerializeAsV3(It.IsAny<IOpenApiWriter>()), Times.Never);
+        }
     }
 }