Remove most of string.Trim() usages in System.Private.Xml solution. (d…

…otnet#75452) * Remove most of string.Trim() usages in Xml solution. * Address feedback * Add checks if input string is null Co-authored-by: Traian Zaprianov <Traian.Zaprianov@docuware.com>
jkotas · Sep 26, 2022 · b34abe1 · b34abe1
1 parent 19c5d17
commit b34abe1
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 144 deletions.
diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextReaderImpl.cs
@@ -5119,7 +5119,7 @@ private void OnXmlReservedAttribute(NodeData attr)
                         PushXmlContext();
                     }
 
-                    switch (XmlConvert.TrimString(attr.StringValue))
+                    switch (attr.StringValue.AsSpan().Trim(XmlConvert.WhitespaceChars))
                     {
                         case "preserve":
                             _xmlContext.xmlSpace = XmlSpace.Preserve;

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextWriter.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlTextWriter.cs
@@ -1758,18 +1758,16 @@ private void HandleSpecialAttribute()
                     break;
                 case SpecialAttr.XmlSpace:
                     // validate XmlSpace attribute
-                    value = XmlConvert.TrimString(value);
-                    if (value == "default")
+                    switch (value.AsSpan().Trim(XmlConvert.WhitespaceChars))
                     {
-                        _stack[_top].xmlSpace = XmlSpace.Default;
-                    }
-                    else if (value == "preserve")
-                    {
-                        _stack[_top].xmlSpace = XmlSpace.Preserve;
-                    }
-                    else
-                    {
-                        throw new ArgumentException(SR.Format(SR.Xml_InvalidXmlSpace, value));
+                        case "default":
+                            _stack[_top].xmlSpace = XmlSpace.Default;
+                            break;
+                        case "preserve":
+                            _stack[_top].xmlSpace = XmlSpace.Preserve;
+                            break;
+                        default:
+                            throw new ArgumentException(SR.Format(SR.Xml_InvalidXmlSpace, value));
                     }
                     break;
                 case SpecialAttr.XmlNs:

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlWellFormedWriterHelpers.cs b/src/libraries/System.Private.Xml/src/System/Xml/Core/XmlWellFormedWriterHelpers.cs
@@ -403,10 +403,11 @@ internal void Trim()
 
                 // trim the string in StringBuilder
                 string valBefore = _stringValue.ToString();
-                string valAfter = XmlConvert.TrimString(valBefore);
+                ReadOnlySpan<char> valAfter = valBefore.AsSpan().Trim(XmlConvert.WhitespaceChars);
                 if (valBefore != valAfter)
                 {
-                    _stringValue = new StringBuilder(valAfter);
+                    _stringValue = new StringBuilder();
+                    _stringValue.Append(valAfter);
                 }
 
                 // trim the beginning of the recorded writer events

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlNode.cs b/src/libraries/System.Private.Xml/src/System/Xml/Dom/XmlNode.cs
@@ -1349,7 +1349,7 @@ internal virtual XmlSpace XmlSpace
                     elem = node as XmlElement;
                     if (elem != null && elem.HasAttribute("xml:space"))
                     {
-                        switch (XmlConvert.TrimString(elem.GetAttribute("xml:space")))
+                        switch (elem.GetAttribute("xml:space").AsSpan().Trim(XmlConvert.WhitespaceChars))
                         {
                             case "default":
                                 return XmlSpace.Default;

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs b/src/libraries/System.Private.Xml/src/System/Xml/Schema/XmlValueConverter.cs
@@ -588,7 +588,7 @@ protected static byte[] StringToHexBinary(string value)
         {
             try
             {
-                return XmlConvert.FromBinHexString(XmlConvert.TrimString(value), false);
+                return XmlConvert.FromBinHexString(value.AsSpan().Trim(XmlConvert.WhitespaceChars), false);
             }
             catch (XmlException e)
             {

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs b/src/libraries/System.Private.Xml/src/System/Xml/Serialization/Xmlcustomformatter.cs
@@ -437,8 +437,7 @@ internal static char ToChar(string value)
         internal static byte[]? ToByteArrayHex(string? value)
         {
             if (value == null) return null;
-            value = value.Trim();
-            return XmlConvert.FromBinHexString(value);
+            return XmlConvert.FromBinHexString(value.AsSpan().Trim(), true);
         }
 
         internal static long ToEnum(string val, Hashtable vals, string? typeName, bool validate)

diff --git a/src/libraries/System.Private.Xml/src/System/Xml/XPath/XPathNavigatorReader.cs b/src/libraries/System.Private.Xml/src/System/Xml/XPath/XPathNavigatorReader.cs
@@ -264,7 +264,7 @@ public override XmlSpace XmlSpace
                 {
                     if (tempNav.MoveToAttribute(XPathNavigatorReader.space, XmlReservedNs.NsXml))
                     {
-                        switch (XmlConvert.TrimString(tempNav.Value))
+                        switch (tempNav.Value.AsSpan().Trim(XmlConvert.WhitespaceChars))
                         {
                             case "default":
                                 return XmlSpace.Default;