Fix sonar issues

Author: vbreuss

Source/Mockolate/Web/ItExtensions.HttpContent.WithFormData.cs

@@ -92,13 +92,13 @@ public void Exactly()
 					)
 				);
 
-		private IEnumerable<(string, string)> GetFormData(string rawContent)
+		private static IEnumerable<(string, string)> GetFormData(string rawContent)
 		{
 			string rawFormData = ExtractFormDataFromMultipartContent(rawContent);
 			return ParseFormDataParameters(rawFormData);
 		}
 
-		private string ExtractFormDataFromMultipartContent(string rawContent)
+		private static string ExtractFormDataFromMultipartContent(string rawContent)
 		{
 			string[] lines = rawContent.Split('\n');
 			StringBuilder sb = new();

Source/Mockolate/Web/ItExtensions.HttpContent.cs

@@ -148,66 +148,56 @@ public void InvokeCallbacks(object? value)
 			}
 		}
 
-#if NET8_0_OR_GREATER
-		private static string GetStringFromHttpContent(HttpContent content, HttpRequestMessage? _)
-#else
-		private static string GetStringFromHttpContent(HttpContent content, HttpRequestMessage? message)
-#endif
+		private interface IContentMatcher
 		{
-			static Encoding GetEncodingFromCharset(string? charset)
+			bool Matches(HttpContent content, HttpRequestMessage? message);
+		}
+
+		private sealed class PredicateStringMatcher(Func<string, bool> predicate) : IContentMatcher
+		{
+			public bool Matches(HttpContent content, HttpRequestMessage? message)
 			{
-				if (!string.IsNullOrEmpty(charset))
+				static Encoding GetEncodingFromCharset(string? charset)
 				{
-					try
+					if (!string.IsNullOrEmpty(charset))
 					{
-						return Encoding.GetEncoding(charset);
+						try
+						{
+							return Encoding.GetEncoding(charset);
+						}
+						catch (ArgumentException)
+						{
+							// If the charset is invalid or not supported, we fall back to the default encoding (UTF-8).
+						}
 					}
-					catch (ArgumentException)
-					{
-						// If the charset is invalid or not supported, we fall back to the default encoding (UTF-8).
-					}
-				}
 
-				return Encoding.UTF8;
-			}
+					return Encoding.UTF8;
+				}
 
-			string? charset = content.Headers.ContentType?.CharSet;
-			Encoding encoding = GetEncodingFromCharset(charset);
+				string? charset = content.Headers.ContentType?.CharSet;
+				Encoding encoding = GetEncodingFromCharset(charset);
 #if NET8_0_OR_GREATER
-			Stream stream = content.ReadAsStream();
-			long position = stream.Position;
-			using StreamReader reader = new(stream, encoding, leaveOpen: true);
-			string stringContent = reader.ReadToEnd();
-			stream.Position = position;
-#else
-			string stringContent;
-			if (message?.Properties.TryGetValue("Mockolate:HttpContent", out object value) == true
-			    && value is byte[] bytes)
-			{
-				stringContent = encoding.GetString(bytes);
-			}
-			else
-			{
-				Stream stream = content.ReadAsStreamAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+				Stream stream = content.ReadAsStream();
 				long position = stream.Position;
-				using StreamReader reader = new(stream, encoding, true, 1024, true);
-				stringContent = reader.ReadToEnd();
+				using StreamReader reader = new(stream, encoding, leaveOpen: true);
+				string stringContent = reader.ReadToEnd();
 				stream.Position = position;
-			}
+#else
+				string stringContent;
+				if (message?.Properties.TryGetValue("Mockolate:HttpContent", out object value) == true
+				    && value is byte[] bytes)
+				{
+					stringContent = encoding.GetString(bytes);
+				}
+				else
+				{
+					Stream stream = content.ReadAsStreamAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+					long position = stream.Position;
+					using StreamReader reader = new(stream, encoding, true, 1024, true);
+					stringContent = reader.ReadToEnd();
+					stream.Position = position;
+				}
 #endif
-			return stringContent;
-		}
-
-		private interface IContentMatcher
-		{
-			bool Matches(HttpContent content, HttpRequestMessage? message);
-		}
-
-		private sealed class PredicateStringMatcher(Func<string, bool> predicate) : IContentMatcher
-		{
-			public bool Matches(HttpContent content, HttpRequestMessage? message)
-			{
-				string stringContent = GetStringFromHttpContent(content, message);
 				return predicate.Invoke(stringContent);
 			}
 		}