Replace ReplaceAll with built-in string.Replace()

Author: mythz

src/ServiceStack.Text/StringExtensions.cs

@@ -922,20 +922,9 @@ public static string ReplaceFirst(this string haystack, string needle, string re
             return haystack.Substring(0, pos) + replacement + haystack.Substring(pos + needle.Length);
         }
 
-        public static string ReplaceAll(this string haystack, string needle, string replacement)
-        {
-            int pos;
-            // Avoid a possible infinite loop
-            if (needle == replacement) 
-                return haystack;
-            while ((pos = haystack.IndexOf(needle, StringComparison.Ordinal)) >= 0)
-            {
-                haystack = haystack.Substring(0, pos)
-                    + replacement
-                    + haystack.Substring(pos + needle.Length);
-            }
-            return haystack;
-        }
+        [Obsolete("Use built-in string.Replace()")]
+        public static string ReplaceAll(this string haystack, string needle, string replacement) => 
+            haystack.Replace(needle, replacement);
 
         public static bool ContainsAny(this string text, params string[] testMatches)
         {

tests/ServiceStack.Text.Tests/StringExtensionsTests.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using NUnit.Framework;
 
 namespace ServiceStack.Text.Tests
@@ -362,6 +363,17 @@ public void Does_ReplaceAll_from_Start()
             Assert.That("/images".ReplaceAll("/",""), Is.EqualTo("images"));
         }
 
+        [Test]
+        public void Does_ReplaceAll_Avoid_Infinite_Loops()
+        {
+            var input = "image";
+            var output = input;
+
+            output = input.ReplaceAll("image", "images");
+
+            Assert.That(output, Is.EqualTo("images"));
+        }
+
         [TestCase("", ExpectedResult = "/")]
         [TestCase("/", ExpectedResult = "/")]
         [TestCase("?p1=asdf", ExpectedResult = "/?p1=asdf")]