Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace WireMock.Matchers;
/// CSharpCode / CS-Script Matcher
/// </summary>
/// <inheritdoc cref="ICSharpCodeMatcher"/>
internal class CSharpCodeMatcher : ICSharpCodeMatcher
public class CSharpCodeMatcher : ICSharpCodeMatcher
{
private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";

Expand Down Expand Up @@ -63,17 +63,24 @@ public CSharpCodeMatcher(MatchBehaviour matchBehaviour, MatchOperator matchOpera
Value = patterns;
}

public MatchResult IsMatch(string? input)
{
return IsMatchInternal(input);
}
/// <inheritdoc />
public MatchResult IsMatch(string? input) => IsMatchInternal(input);

public MatchResult IsMatch(object? input)
/// <inheritdoc />
public MatchResult IsMatch(object? input) => IsMatchInternal(input);

/// <inheritdoc />
public string GetCSharpCodeArguments()
{
return IsMatchInternal(input);
return $"new {Name}" +
$"(" +
$"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
$"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
$"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
$")";
}

public MatchResult IsMatchInternal(object? input)
private MatchResult IsMatchInternal(object? input)
{
var score = MatchScores.Mismatch;
Exception? exception = null;
Expand All @@ -93,17 +100,6 @@ public MatchResult IsMatchInternal(object? input)
return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
}

/// <inheritdoc />
public string GetCSharpCodeArguments()
{
return $"new {Name}" +
$"(" +
$"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
$"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
$"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
$")";
}

private bool IsMatch(dynamic input, string pattern)
{
var isMatchWithString = input is string;
Expand Down
4 changes: 1 addition & 3 deletions src/WireMock.Net.Shared/Matchers/ICSharpCodeMatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ namespace WireMock.Matchers;
/// </summary>
/// <inheritdoc cref="IObjectMatcher"/>
/// <inheritdoc cref="IStringMatcher"/>
public interface ICSharpCodeMatcher : IObjectMatcher, IStringMatcher
{
}
public interface ICSharpCodeMatcher : IObjectMatcher, IStringMatcher;
Loading