Fix #1501: Generate WhenStateIs/WillSetStateTo correctly in ToCSharpCode

src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs

@@ -70,7 +70,7 @@ public CSharpCodeMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOpera
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(CSharpCodeMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +

src/WireMock.Net.Matchers.SystemTextJsonPath/Matchers/SystemTextJsonPathMatcher.cs

@@ -126,7 +126,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(SystemTextJsonPathMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +

src/WireMock.Net.Minimal/Matchers/ContentTypeMatcher.cs

@@ -80,10 +80,10 @@ public override AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public override string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(ContentTypeMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] {{ {MappingConverterUtils.ToCSharpCodeArguments(_patterns)} }}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}" +
                $")";
     }

src/WireMock.Net.Minimal/Matchers/ExactMatcher.cs

@@ -95,7 +95,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(ExactMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +

src/WireMock.Net.Minimal/Matchers/FormUrlEncodedMatcher.cs

@@ -167,10 +167,10 @@ public virtual AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(FormUrlEncodedMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] {{ {MappingConverterUtils.ToCSharpCodeArguments(_patterns)} }}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
                $")";

src/WireMock.Net.Minimal/Matchers/FuncMatcher.cs

@@ -76,7 +76,7 @@ public MatchResult IsMatch(object? value)
     public string GetCSharpCodeArguments()
     {
         var funcType = _stringFunc != null ? "Func<string?, bool>" : "Func<byte[]?, bool>";
-        return $"new {Name}" +
+        return $"new {typeof(FuncMatcher).FullName}" +
                $"(" +
                $"/* {funcType} function */, " +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}" +

src/WireMock.Net.Minimal/Matchers/JSONPathMatcher.cs

@@ -119,7 +119,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(JsonPathMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +

src/WireMock.Net.Minimal/Matchers/JmesPathMatcher.cs

@@ -119,7 +119,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(JmesPathMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +

src/WireMock.Net.Minimal/Matchers/JsonMatcher.cs

@@ -110,7 +110,7 @@ public MatchResult IsMatch(object? input)
     /// <inheritdoc />
     public virtual string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(JsonMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +

src/WireMock.Net.Minimal/Matchers/JsonPartialMatcher.cs

@@ -41,7 +41,7 @@ protected override bool IsMatch(string value, string input)
     /// <inheritdoc />
     public override string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(JsonPartialMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +

src/WireMock.Net.Minimal/Matchers/JsonPartialWildCardMatcher.cs

@@ -41,7 +41,7 @@ protected override bool IsMatch(string value, string input)
     /// <inheritdoc />
     public override string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(JsonPartialWildcardMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +

src/WireMock.Net.Minimal/Matchers/LinqMatcher.cs

@@ -141,7 +141,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(LinqMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +

src/WireMock.Net.Minimal/Matchers/SimMetricsMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using AnyOfTypes;
 using SimMetrics.Net;
 using SimMetrics.Net.API;
@@ -92,10 +91,10 @@ public MatchResult IsMatch(string? input)
     /// <inheritdoc />
     public virtual string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(SimMetricsMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] {{ {MappingConverterUtils.ToCSharpCodeArguments(_patterns)} }}, " +
                $"{_simMetricType.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
                $")";

src/WireMock.Net.Minimal/Matchers/SystemTextJsonMatcher.cs

@@ -115,7 +115,7 @@ public MatchResult IsMatch(object? input)
     /// <inheritdoc />
     public virtual string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(SystemTextJsonMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +

src/WireMock.Net.Minimal/Matchers/SystemTextJsonPartialMatcher.cs

@@ -41,7 +41,7 @@ protected override bool IsMatch(string value, string input)
     /// <inheritdoc />
     public override string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(SystemTextJsonPartialMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +

src/WireMock.Net.Minimal/Matchers/SystemTextJsonPartialWildcardMatcher.cs

@@ -41,7 +41,7 @@ protected override bool IsMatch(string value, string input)
     /// <inheritdoc />
     public override string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(SystemTextJsonPartialWildcardMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +

src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs

@@ -101,7 +101,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(XPathMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +

src/WireMock.Net.Minimal/Serialization/MappingConverter.cs

@@ -146,7 +146,7 @@ public string ToCSharpCode(IMapping mapping, MappingConverterSettings? settings
 
                 case JsonMatcher jsonMatcher:
                     {
-                        var matcherType = jsonMatcher.GetType().Name;
+                        var matcherType = jsonMatcher.GetType().FullName;
                         sb.AppendLine($"        .WithBody(new {matcherType}(");
                         sb.AppendLine($"            value: {ConvertToAnonymousObjectDefinition(jsonMatcher.Value, 3)},");
                         sb.AppendLine($"            ignoreCase: {ToCSharpBooleanLiteral(jsonMatcher.IgnoreCase)},");
@@ -162,14 +162,18 @@ public string ToCSharpCode(IMapping mapping, MappingConverterSettings? settings
         // Guid
         sb.AppendLine($"    .WithGuid(\"{mapping.Guid}\")");
 
-        // Scenario + State
+        // Scenario, ExecutionConditionState, NextState and StateTimes
         if (!string.IsNullOrEmpty(mapping.Scenario))
         {
             sb.AppendLine($"    .InScenario({ToCSharpStringLiteral(mapping.Scenario)})");
         }
+        if (!string.IsNullOrEmpty(mapping.ExecutionConditionState))
+        {
+            sb.AppendLine($"    .WhenStateIs({ToCSharpStringLiteral(mapping.ExecutionConditionState)})");
+        }
         if (!string.IsNullOrEmpty(mapping.NextState))
         {
-            sb.AppendLine($"    .WhenStateIs({ToCSharpStringLiteral(mapping.NextState)}, {ToCSharpIntLiteral(mapping.TimesInSameState)})");
+            sb.AppendLine($"    .WillSetStateTo({ToCSharpStringLiteral(mapping.NextState)}, {ToCSharpIntLiteral(mapping.TimesInSameState)})");
         }
 
         if (mapping.Probability != null)

src/WireMock.Net.Shared/Matchers/NotNullOrEmptyMatcher.cs

@@ -75,7 +75,7 @@ public AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(NotNullOrEmptyMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}" +
                $")";

src/WireMock.Net.Shared/Matchers/RegexMatcher.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Linq;
 using System.Text.RegularExpressions;
 using AnyOfTypes;
 using JetBrains.Annotations;
@@ -132,10 +130,10 @@ public virtual AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public virtual string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(RegexMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] {{ {MappingConverterUtils.ToCSharpCodeArguments(_patterns)} }}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(_useRegexExtended)}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}" +

src/WireMock.Net.Shared/Matchers/WildcardMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using System.Text.RegularExpressions;
 using AnyOfTypes;
 using Stef.Validation;
@@ -74,10 +73,10 @@ public override AnyOf<string, StringPattern>[] GetPatterns()
     /// <inheritdoc />
     public override string GetCSharpCodeArguments()
     {
-        return $"new {Name}" +
+        return $"new {typeof(WildcardMatcher).FullName}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] {{ {MappingConverterUtils.ToCSharpCodeArguments(_patterns)} }}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
                $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
                $")";

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingCodeByGuidAsync.verified.txt

@@ -2,8 +2,8 @@
 server
     .Given(Request.Create()
         .UsingMethod("GET")
-        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo1", false, WireMock.Matchers.MatchOperator.Or))
-        .WithParam("p1", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "xyz"))
+        .WithPath(new WireMock.Matchers.WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] { "/foo1" }, false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("p1", new WireMock.Matchers.ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "xyz"))
     )
     .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
     .RespondWith(Response.Create()

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingsCode.verified.txt

@@ -2,8 +2,8 @@
 server
     .Given(Request.Create()
         .UsingMethod("POST")
-        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post2", false, WireMock.Matchers.MatchOperator.Or))
-        .WithBody(new JsonPartialMatcher(
+        .WithPath(new WireMock.Matchers.WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] { "/users/post2" }, false, WireMock.Matchers.MatchOperator.Or))
+        .WithBody(new WireMock.Matchers.JsonPartialMatcher(
             value: new
             {
                 city = "City",
@@ -22,8 +22,8 @@ Some ""value"" in Line2")
 server
     .Given(Request.Create()
         .UsingMethod("POST")
-        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo2", false, WireMock.Matchers.MatchOperator.Or))
-        .WithParam("p2", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "abc"))
+        .WithPath(new WireMock.Matchers.WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] { "/foo2" }, false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("p2", new WireMock.Matchers.ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "abc"))
         .WithHeader("h1", "W/\"234f2q3r\"", true)
     )
     .WithGuid("4126dec8-470b-4eff-93bb-c24f83b8b1fd")
@@ -37,8 +37,8 @@ server
 server
     .Given(Request.Create()
         .UsingMethod("POST")
-        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post1", false, WireMock.Matchers.MatchOperator.Or))
-        .WithBody(new JsonMatcher(
+        .WithPath(new WireMock.Matchers.WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] { "/users/post1" }, false, WireMock.Matchers.MatchOperator.Or))
+        .WithBody(new WireMock.Matchers.JsonMatcher(
             value: new
             {
                 city = "Amsterdam",
@@ -55,7 +55,7 @@ server
 server
     .Given(Request.Create()
         .UsingMethod("DELETE")
-        .WithUrl(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "https://localhost/test", false, WireMock.Matchers.MatchOperator.Or))
+        .WithUrl(new WireMock.Matchers.WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] { "https://localhost/test" }, false, WireMock.Matchers.MatchOperator.Or))
     )
     .WithGuid("c9929240-7ae8-4a5d-8ed8-0913479f6eeb")
     .RespondWith(Response.Create()
@@ -99,8 +99,8 @@ text
 server
     .Given(Request.Create()
         .UsingMethod("GET")
-        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo1", false, WireMock.Matchers.MatchOperator.Or))
-        .WithParam("p1", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "xyz"))
+        .WithPath(new WireMock.Matchers.WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern>[] { "/foo1" }, false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("p1", new WireMock.Matchers.ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "xyz"))
     )
     .WithGuid("f74fd144-df53-404f-8e35-da22a640bd5f")
     .RespondWith(Response.Create()