.

Author: SimonCropp

src/Benchmarks/ScrubberPipelineBenchmarks.cs

@@ -1,5 +1,3 @@
-using VerifyTests;
-
 [MemoryDiagnoser]
 [SimpleJob(iterationCount: 10, warmupCount: 3)]
 public class ScrubberPipelineBenchmarks
@@ -58,35 +56,35 @@ static string BuildLogLine(int i) =>
     public void New_Tiny_Guid()
     {
         var builder = new StringBuilder(tinyInput);
-        ApplyScrubbers.ApplyForExtension("txt", builder, settingsGuid, counter);
+        ScrubberPipeline.ApplyForExtension("txt", builder, settingsGuid, counter);
     }
 
     [Benchmark]
     public void New_Medium_Mixed()
     {
         var builder = new StringBuilder(mediumInput);
-        ApplyScrubbers.ApplyForExtension("txt", builder, settingsMixed, counter);
+        ScrubberPipeline.ApplyForExtension("txt", builder, settingsMixed, counter);
     }
 
     [Benchmark]
     public void New_Large_Mixed()
     {
         var builder = new StringBuilder(largeInput);
-        ApplyScrubbers.ApplyForExtension("txt", builder, settingsMixed, counter);
+        ScrubberPipeline.ApplyForExtension("txt", builder, settingsMixed, counter);
     }
 
     [Benchmark]
     public void New_NoMatch()
     {
         var builder = new StringBuilder(noMatchInput);
-        ApplyScrubbers.ApplyForExtension("txt", builder, settingsMixed, counter);
+        ScrubberPipeline.ApplyForExtension("txt", builder, settingsMixed, counter);
     }
 
     [Benchmark]
     public void New_ShortLines()
     {
         var builder = new StringBuilder(shortLinesInput);
-        ApplyScrubbers.ApplyForExtension("txt", builder, settingsMixed, counter);
+        ScrubberPipeline.ApplyForExtension("txt", builder, settingsMixed, counter);
     }
 
     // ---- Old pipeline (legacy delegate-based scrubber) ----

src/Verify/Serialization/CustomContractResolver_Dictionary.cs

@@ -100,7 +100,7 @@ static bool TryConvertDictionaryKey(VerifyJsonWriter writer, object original, [N
                 return true;
             }
 
-            result = ApplyScrubbers.ApplyForPropertyValue(stringValue.AsSpan(), writer.settings, counter);
+            result = ScrubberPipeline.ApplyForPropertyValue(stringValue.AsSpan(), writer.settings, counter);
 
             return true;
         }

src/Verify/Serialization/Scrubbers/ApplyScrubbers.cs

@@ -68,7 +68,7 @@ public void WriteRawValueWithScrubbers(CharSpan value)
             return;
         }
 
-        value = ApplyScrubbers.ApplyForPropertyValue(value, settings, Counter);
+        value = ScrubberPipeline.ApplyForPropertyValue(value, settings, Counter);
         WriteRawValueIfNoStrict(value);
     }
 
@@ -121,7 +121,7 @@ public override void WriteValue(CharSpan value)
             return;
         }
 
-        value = ApplyScrubbers.ApplyForPropertyValue(value, settings, Counter);
+        value = ScrubberPipeline.ApplyForPropertyValue(value, settings, Counter);
         if (settings.StrictJson)
         {
             base.WriteValue(value);

src/Verify/Serialization/VerifyJsonWriter.cs

@@ -81,7 +81,7 @@ async Task<VerifyResult> VerifyInner(object? root, Func<Task>? cleanup, IEnumera
         {
             if (target.TryGetStringBuilder(out var builder))
             {
-                ApplyScrubbers.ApplyForExtension(target.Extension, builder, settings, counter);
+                ScrubberPipeline.ApplyForExtension(target.Extension, builder, settings, counter);
             }
         }
 
@@ -120,7 +120,7 @@ bool TryGetRootTarget(object? root,bool ignoreNullRoot, [NotNullWhen(true)] out
             else
             {
                 var builder = new StringBuilder(stringRoot);
-                ApplyScrubbers.ApplyForExtension("txt", builder, settings, counter);
+                ScrubberPipeline.ApplyForExtension("txt", builder, settings, counter);
                 target = new("txt", builder);
             }
 

src/Verify/Verifier/InnerVerifier_Inner.cs

@@ -106,7 +106,7 @@ string ConvertValue(string value)
             return result;
         }
 
-        return ApplyScrubbers.ApplyForPropertyValue(span, settings, counter);
+        return ScrubberPipeline.ApplyForPropertyValue(span, settings, counter);
     }
 
     void ScrubAttributes(XElement node, SerializationSettings serialization)
@@ -136,7 +136,7 @@ void ScrubAttributes(XElement node, SerializationSettings serialization)
             }
             else
             {
-                attribute.Value = ApplyScrubbers.ApplyForPropertyValue(span, settings, counter);
+                attribute.Value = ScrubberPipeline.ApplyForPropertyValue(span, settings, counter);
             }
         }
     }