Refactor code for reuse

microsoft · Jan 25, 2024 · e3e8fc7 · e3e8fc7
1 parent c8a4a00
commit e3e8fc7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Microsoft.OpenApi/Models/OpenApiExample.cs b/src/Microsoft.OpenApi/Models/OpenApiExample.cs
@@ -118,6 +118,16 @@ public OpenApiExample GetEffective(OpenApiDocument doc)
         /// Serialize to OpenAPI V3 document without using reference.
         /// </summary>
         public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        {
+            Serialize(writer, OpenApiSpecVersion.OpenApi3_0);
+        }
+
+        /// <summary>
+        /// Writes out existing examples in a mediatype object
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="version"></param>
+        public void Serialize(IOpenApiWriter writer, OpenApiSpecVersion version)
         {
             writer.WriteStartObject();
 
@@ -134,7 +144,7 @@ public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.ExternalValue, ExternalValue);
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }

diff --git a/src/Microsoft.OpenApi/Models/OpenApiParameter.cs b/src/Microsoft.OpenApi/Models/OpenApiParameter.cs
@@ -397,7 +397,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                 foreach (var example in Examples)
                 {
                     writer.WritePropertyName(example.Key);
-                    writer.WriteV2Examples(writer, example.Value, OpenApiSpecVersion.OpenApi2_0);
+                    example.Value.Serialize(writer, OpenApiSpecVersion.OpenApi2_0);
                 }
                 writer.WriteEndObject();
             }

diff --git a/src/Microsoft.OpenApi/Models/OpenApiResponse.cs b/src/Microsoft.OpenApi/Models/OpenApiResponse.cs
@@ -204,7 +204,7 @@ public void SerializeAsV2WithoutReference(IOpenApiWriter writer)
                             .SelectMany(mediaTypePair => mediaTypePair.Value.Examples))
                         {
                             writer.WritePropertyName(example.Key);
-                            writer.WriteV2Examples(writer, example.Value, OpenApiSpecVersion.OpenApi2_0);
+                            example.Value.Serialize(writer, OpenApiSpecVersion.OpenApi2_0);
                         }
 
                         writer.WriteEndObject();