Fixed issue with XML Entity Formatter stream output

Author: PatrickRitchie

libraries/MTConnect.NET-XML/Formatters/XmlEntityFormatter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2024 TrakHound Inc., All Rights Reserved.
+// Copyright (c) 2025 TrakHound Inc., All Rights Reserved.
 // TrakHound Inc. licenses this file to you under the MIT license.
 
 using MTConnect.Assets;
@@ -31,16 +31,15 @@ public FormatWriteResult Format(IDevice device, IEnumerable<KeyValuePair<string,
 
                 try
                 {
-                    using (var outputStream = new MemoryStream())
+                    var outputStream = new MemoryStream();
+
+                    // Use XmlWriter to write XML to stream
+                    using (var xmlWriter = XmlWriter.Create(outputStream, settings))
                     {
-                        // Use XmlWriter to write XML to stream
-                        using (var xmlWriter = XmlWriter.Create(outputStream, settings))
-                        {
-                            XmlDevice.WriteXml(xmlWriter, device);
-                            xmlWriter.Flush();
+                        XmlDevice.WriteXml(xmlWriter, device);
+                        xmlWriter.Flush();
 
-                            return FormatWriteResult.Successful(outputStream, ContentType);
-                        }
+                        return FormatWriteResult.Successful(outputStream, ContentType);
                     }
                 }
                 catch { }
@@ -53,13 +52,18 @@ public FormatWriteResult Format(IObservation observation, IEnumerable<KeyValuePa
         {
             if (observation != null)
             {
+                var indentOuput = GetFormatterOption<bool>(options, "indentOutput");
+                var settings = indentOuput ? XmlFunctions.XmlWriterSettingsIndent : XmlFunctions.XmlWriterSettings;
+
                 try
                 {
-                    using (var outputStream = new MemoryStream())
+                    var outputStream = new MemoryStream();
+
+                    // Use XmlWriter to write XML to stream
+                    using (var xmlWriter = XmlWriter.Create(outputStream, settings))
                     {
-                        // Use XmlWriter to write XML to stream
-                        var xmlWriter = XmlWriter.Create(outputStream, XmlFunctions.XmlWriterSettings);
                         XmlObservation.WriteXml(xmlWriter, observation);
+                        xmlWriter.Flush();
 
                         return FormatWriteResult.Successful(outputStream, ContentType);
                     }
@@ -74,19 +78,24 @@ public FormatWriteResult Format(IEnumerable<IObservation> observations, IEnumera
         {
             if (!observations.IsNullOrEmpty())
             {
+                var indentOuput = GetFormatterOption<bool>(options, "indentOutput");
+                var settings = indentOuput ? XmlFunctions.XmlWriterSettingsIndent : XmlFunctions.XmlWriterSettings;
+
                 try
                 {
-                    using (var outputStream = new MemoryStream())
+                    var outputStream = new MemoryStream();
+
+                    // Use XmlWriter to write XML to stream
+                    using (var xmlWriter = XmlWriter.Create(outputStream, settings))
                     {
                         foreach (var observation in observations)
                         {
-                            // Use XmlWriter to write XML to stream
-                            var xmlWriter = XmlWriter.Create(outputStream, XmlFunctions.XmlWriterSettings);
                             XmlObservation.WriteXml(xmlWriter, observation);
+                            xmlWriter.Flush();
                         }
-
-                        return FormatWriteResult.Successful(outputStream, ContentType);
                     }
+
+                    return FormatWriteResult.Successful(outputStream, ContentType);
                 }
                 catch { }
             }