.

WireMock-Net · Jul 17, 2024 · fd304fe · fd304fe
1 parent fd00025
commit fd304fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/WireMock.Net/Matchers/Helpers/BodyDataMatchScoreCalculator.cs b/src/WireMock.Net/Matchers/Helpers/BodyDataMatchScoreCalculator.cs
@@ -60,14 +60,10 @@ public static MatchResult CalculateMatchScore(IBodyData? requestMessage, IMatche
             }
         }
 
-        // Check if the matcher is a IStringMatcher
-        if (matcher is IStringMatcher stringMatcher)
+        // In case the matcher is a IStringMatcher and If  body is a Json or a String, use the BodyAsString to match on.
+        if (matcher is IStringMatcher stringMatcher && requestMessage.DetectedBodyType is BodyType.Json or BodyType.String or BodyType.FormUrlEncoded)
         {
-            // If the body is a Json or a String, use the BodyAsString to match on.
-            if (requestMessage.DetectedBodyType is BodyType.Json or BodyType.String or BodyType.FormUrlEncoded)
-            {
-                return stringMatcher.IsMatch(requestMessage.BodyAsString);
-            }
+            return stringMatcher.IsMatch(requestMessage.BodyAsString);
         }
 
         return default;

diff --git a/src/WireMock.Net/Matchers/Request/RequestMessageGraphQLMatcher.cs b/src/WireMock.Net/Matchers/Request/RequestMessageGraphQLMatcher.cs
@@ -78,8 +78,7 @@ public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResu
 
     private static MatchResult CalculateMatchResult(IRequestMessage requestMessage, IMatcher matcher)
     {
-        // Check if the matcher is a IStringMatcher
-        // If the body is a Json or a String, use the BodyAsString to match on.
+        // In case the matcher is a IStringMatcher and the body is a Json or a String, use the BodyAsString to match on.
         if (matcher is IStringMatcher stringMatcher && requestMessage.BodyData?.DetectedBodyType is BodyType.Json or BodyType.String or BodyType.FormUrlEncoded)
         {
             return stringMatcher.IsMatch(requestMessage.BodyData.BodyAsString);