From e208e0f6bf3a25372ba60bdaa4f25792a489428e Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Mon, 29 Jul 2024 19:51:47 +0200 Subject: [PATCH] . --- .../Serialization/MappingFileNameSanitizer.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/WireMock.Net/Serialization/MappingFileNameSanitizer.cs b/src/WireMock.Net/Serialization/MappingFileNameSanitizer.cs index a9419fe8..ff46d92b 100644 --- a/src/WireMock.Net/Serialization/MappingFileNameSanitizer.cs +++ b/src/WireMock.Net/Serialization/MappingFileNameSanitizer.cs @@ -10,24 +10,22 @@ namespace WireMock.Serialization; /// /// Creates sanitized file names for mappings /// -internal class MappingFileNameSanitizer(WireMockServerSettings settings) +internal class MappingFileNameSanitizer { private const string SpaceChar = " "; private const char ReplaceChar = '_'; - private readonly WireMockServerSettings _settings = Guard.NotNull(settings); - /// /// Creates sanitized file names for mappings /// - public string BuildSanitizedFileName(IMapping mapping) + public string BuildSanitizedFileName(IMapping mapping, ProxyAndRecordSettings? proxyAndRecordSettings) { string name; if (!string.IsNullOrEmpty(mapping.Title)) { // remove 'Proxy Mapping for ' and an extra space character after the HTTP request method name = mapping.Title!.Replace(ProxyAndRecordSettings.DefaultPrefixForSavedMappingFile, string.Empty).Replace(SpaceChar, string.Empty); - if (_settings.ProxyAndRecordSettings?.AppendGuidToSavedMappingFile == true) + if (proxyAndRecordSettings?.AppendGuidToSavedMappingFile == true) { name += $"{ReplaceChar}{mapping.Guid}"; } @@ -37,9 +35,9 @@ internal class MappingFileNameSanitizer(WireMockServerSettings settings) name = mapping.Guid.ToString(); } - if (!string.IsNullOrEmpty(_settings.ProxyAndRecordSettings?.PrefixForSavedMappingFile)) + if (!string.IsNullOrEmpty(proxyAndRecordSettings?.PrefixForSavedMappingFile)) { - name = $"{_settings.ProxyAndRecordSettings!.PrefixForSavedMappingFile}{ReplaceChar}{name}"; + name = $"{proxyAndRecordSettings.PrefixForSavedMappingFile}{ReplaceChar}{name}"; } return $"{Path.GetInvalidFileNameChars().Aggregate(name, (current, c) => current.Replace(c, ReplaceChar))}.json";