fix: fixes inlining override when they should not happen

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

src/Microsoft.OpenApi/Models/OpenApiReference.cs

@@ -158,11 +158,12 @@ public OpenApiReference(OpenApiReference reference)
         /// </summary>
         public void SerializeAsV31(IOpenApiWriter writer)
         {
-            // summary and description are in 3.1 but not in 3.0
-            writer.WriteProperty(OpenApiConstants.Summary, Summary);
-            writer.WriteProperty(OpenApiConstants.Description, Description);
-
-            SerializeInternal(writer);
+            SerializeInternal(writer, x =>
+            {
+                // summary and description are in 3.1 but not in 3.0
+                writer.WriteProperty(OpenApiConstants.Summary, Summary);
+                writer.WriteProperty(OpenApiConstants.Description, Description);
+            });
         }
 
         /// <summary>
@@ -176,7 +177,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
         /// <summary>
         /// Serialize <see cref="OpenApiReference"/>
         /// </summary>
-        private void SerializeInternal(IOpenApiWriter writer)
+        private void SerializeInternal(IOpenApiWriter writer, Action<IOpenApiWriter> callback = null)
         {
             Utils.CheckArgumentNull(writer);
 
@@ -188,6 +189,10 @@ private void SerializeInternal(IOpenApiWriter writer)
             }
 
             writer.WriteStartObject();
+            if (callback is not null)
+            {
+                callback(writer);
+            }
 
             // $ref
             writer.WriteProperty(OpenApiConstants.DollarRef, ReferenceV3);

src/Microsoft.OpenApi/Models/References/BaseOpenApiReferenceHolder.cs

@@ -80,7 +80,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
         }
         else
         {
-            SerializeInternal(writer, (writer, element) => CopyReferenceAsTargetElementWithOverrides(element).SerializeAsV3(writer));
+            SerializeInternal(writer, (writer, element) => element.SerializeAsV3(writer));
         }
     }
 
@@ -106,7 +106,7 @@ public virtual void SerializeAsV2(IOpenApiWriter writer)
         }
         else
         {
-            SerializeInternal(writer, (writer, element) => CopyReferenceAsTargetElementWithOverrides(element).SerializeAsV2(writer));
+            SerializeInternal(writer, (writer, element) => element.SerializeAsV2(writer));
         }
     }
 

test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=False.verified.txt

@@ -0,0 +1,4 @@
+{
+  "description": "User request body",
+  "$ref": "#/components/requestBodies/UserRequest"
+}

test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False.verified.txt renamed to test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=False_inlineLocalReferences=True.verified.txt

@@ -0,0 +1 @@
+{"description":"User request body","$ref":"#/components/requestBodies/UserRequest"}

test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=False.verified.txt

@@ -0,0 +1,18 @@
+{
+  "description": "User creation request body",
+  "content": {
+    "application/json": {
+      "schema": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "email": {
+            "type": "string"
+          }
+        }
+      }
+    }
+  }
+}

test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True.verified.txt renamed to test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.SerializeRequestBodyReferenceAsV31JsonWorks_produceTerseOutput=True_inlineLocalReferences=True.verified.txt

@@ -0,0 +1 @@
+{"description":"User creation request body","content":{"application/json":{"schema":{"type":"object","properties":{"name":{"type":"string"},"email":{"type":"string"}}}}}}