fix: use settings for terse output in serialization extension methods

Signed-off-by: Vincent Biret <vibiret@microsoft.com>

Author: baywet

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -192,16 +192,17 @@ private static async Task WriteOpenApiAsync(HidiOptions options, string openApiF
                 using var outputStream = options.Output.Create();
                 using var textWriter = new StreamWriter(outputStream);
 
-                var settings = new OpenApiWriterSettings
+                var settings = new OpenApiJsonWriterSettings
                 {
                     InlineLocalReferences = options.InlineLocal,
-                    InlineExternalReferences = options.InlineExternal
+                    InlineExternalReferences = options.InlineExternal,
+                    Terse = options.TerseOutput
                 };
 #pragma warning disable CA1308
                 IOpenApiWriter writer = openApiFormat.ToLowerInvariant() switch
 #pragma warning restore CA1308
                 {
-                    OpenApiConstants.Json => options.TerseOutput ? new(textWriter, settings, options.TerseOutput) : new OpenApiJsonWriter(textWriter, settings, false),
+                    OpenApiConstants.Json => new OpenApiJsonWriter(textWriter, settings),
                     OpenApiConstants.Yaml => new OpenApiYamlWriter(textWriter, settings),
                     _ => throw new ArgumentException("Unknown format"),
                 };

src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs

@@ -88,7 +88,8 @@ public static Task SerializeAsync<T>(
 
             IOpenApiWriter writer = format.ToLowerInvariant() switch
             {
-                OpenApiConstants.Json => new OpenApiJsonWriter(streamWriter, settings, false),
+                OpenApiConstants.Json when settings is OpenApiJsonWriterSettings jsonSettings => new OpenApiJsonWriter(streamWriter, jsonSettings),
+                OpenApiConstants.Json => new OpenApiJsonWriter(streamWriter, settings),
                 OpenApiConstants.Yaml => new OpenApiYamlWriter(streamWriter, settings),
                 _ => throw new OpenApiException(string.Format(SRResource.OpenApiFormatNotSupported, format)),
             };

src/Microsoft.OpenApi/Writers/OpenApiJsonWriter.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+using System;
+using System.ComponentModel;
 using System.IO;
 
 namespace Microsoft.OpenApi
@@ -14,7 +16,17 @@ public class OpenApiJsonWriter : OpenApiWriterBase
         /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
         /// </summary>
         /// <param name="textWriter">The text writer.</param>
-        public OpenApiJsonWriter(TextWriter textWriter) : base(textWriter, null)
+        public OpenApiJsonWriter(TextWriter textWriter) : this(textWriter, (OpenApiWriterSettings?)null)
+        {
+			// this constructor is kept for binary compatibility
+            // TODO remove in next major version and make the settings an optional parameter in the other constructor
+		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OpenApiJsonWriter"/> class.
+        /// </summary>
+        /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
+        /// <param name="textWriter">The text writer.</param>
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings? settings) : base(textWriter, settings ?? new OpenApiJsonWriterSettings())
         {
         }
 
@@ -34,9 +46,13 @@ public OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settin
         /// <param name="textWriter">The text writer.</param>
         /// <param name="settings">Settings for controlling how the OpenAPI document will be written out.</param>
         /// <param name="terseOutput"> Setting for allowing the JSON emitted to be in terse format.</param>
-        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings? settings, bool terseOutput = false) : base(textWriter, settings)
+        [Obsolete("Use OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settings) instead.")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public OpenApiJsonWriter(TextWriter textWriter, OpenApiWriterSettings? settings, bool terseOutput) : base(textWriter, settings)
         {
             _produceTerseOutput = terseOutput;
+            // this constructor is kept for binary compatibility, terse information should be read from the settings to avoid fork APIs.
+            // TODO remove in next major version
         }
 
         /// <summary>

src/Microsoft.OpenApi/Writers/OpenApiWriterBase.cs

@@ -55,10 +55,7 @@ protected OpenApiWriterBase(TextWriter textWriter, OpenApiWriterSettings? settin
             Writer.NewLine = "\n";
 
             Scopes = new();
-            if (settings == null)
-            {
-                settings = new();
-            }
+            settings ??= new();
             Settings = settings;
         }
 

test/Microsoft.OpenApi.Tests/PublicApi/PublicApi.approved.txt

@@ -795,7 +795,10 @@ namespace Microsoft.OpenApi
     {
         public OpenApiJsonWriter(System.IO.TextWriter textWriter) { }
         public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.OpenApiJsonWriterSettings settings) { }
-        public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings, bool terseOutput = false) { }
+        public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings) { }
+        [System.Obsolete("Use OpenApiJsonWriter(TextWriter textWriter, OpenApiJsonWriterSettings settings) " +
+            "instead.")]
+        public OpenApiJsonWriter(System.IO.TextWriter textWriter, Microsoft.OpenApi.OpenApiWriterSettings? settings, bool terseOutput) { }
         protected override int BaseIndentation { get; }
         public override void WriteEndArray() { }
         public override void WriteEndObject() { }