From d3640d065efea14dedc4ff902e70a0d3a6f32966 Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Sat, 12 May 2018 12:45:58 +0200
Subject: [PATCH] Reworked code review comments

---
 src/WireMock.Net/Matchers/JSONPathMatcher.cs   | 14 +++++++-------
 .../RequestBuilders/IMethodRequestBuilder.cs   | 18 +++++++++++++++++-
 src/WireMock.Net/RequestBuilders/Request.cs    | 12 ++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/WireMock.Net/Matchers/JSONPathMatcher.cs b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
index 8f0a9dcb..53ef6915 100644
--- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
@@ -1,6 +1,6 @@
-using System;
-using System.Linq;
+using System.Linq;
 using JetBrains.Annotations;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using WireMock.Validation;
 
@@ -47,11 +47,11 @@ namespace WireMock.Matchers
                 try
                 {
                     var jtoken = JToken.Parse(input);
-                    match =  IsMatch(jtoken);
+                    match = IsMatch(jtoken);
                 }
-                catch (Exception)
+                catch (JsonException)
                 {
-                    // just ignore exception
+                    // just ignore JsonException
                 }
             }
 
@@ -70,9 +70,9 @@ namespace WireMock.Matchers
                     JToken jtoken = input is JToken token ? token : JObject.FromObject(input);
                     match = IsMatch(jtoken);
                 }
-                catch (Exception)
+                catch (JsonException)
                 {
-                    // just ignore exception
+                    // just ignore JsonException
                 }
             }
 
diff --git a/src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs b/src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs
index d7d5fe8d..a14b3444 100644
--- a/src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs
+++ b/src/WireMock.Net/RequestBuilders/IMethodRequestBuilder.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using WireMock.Matchers;
 
 namespace WireMock.RequestBuilders
@@ -56,6 +57,13 @@ namespace WireMock.RequestBuilders
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder UsingAnyMethod();
 
+        /// <summary>
+        /// UsingAnyVerb: add HTTP Method matching on any method.
+        /// </summary>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        [Obsolete]
+        IRequestBuilder UsingAnyVerb();
+
         /// <summary>
         /// UsingMethod: add HTTP Method matching on any methods and matchBehaviour.
         /// </summary>
@@ -70,5 +78,13 @@ namespace WireMock.RequestBuilders
         /// <param name="methods">The methods.</param>
         /// <returns>The <see cref="IRequestBuilder"/>.</returns>
         IRequestBuilder UsingMethod([NotNull] params string[] methods);
+
+        /// <summary>
+        /// UsingVerb: add HTTP Method matching on any methods.
+        /// </summary>
+        /// <param name="verbs">The methods.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        [Obsolete]
+        IRequestBuilder UsingVerb([NotNull] params string[] verbs);
     }
 }
\ No newline at end of file
diff --git a/src/WireMock.Net/RequestBuilders/Request.cs b/src/WireMock.Net/RequestBuilders/Request.cs
index d22274b1..2cb36900 100644
--- a/src/WireMock.Net/RequestBuilders/Request.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.cs
@@ -207,12 +207,24 @@ namespace WireMock.RequestBuilders
             return this;
         }
 
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingAnyVerb"/>
+        public IRequestBuilder UsingAnyVerb()
+        {
+            return UsingAnyMethod();
+        }
+
         /// <inheritdoc cref="IMethodRequestBuilder.UsingMethod(string[])"/>
         public IRequestBuilder UsingMethod(params string[] methods)
         {
             return UsingMethod(MatchBehaviour.AcceptOnMatch, methods);
         }
 
+        /// <inheritdoc cref="IMethodRequestBuilder.UsingVerb(string[])"/>
+        public IRequestBuilder UsingVerb(params string[] verbs)
+        {
+            return UsingMethod(verbs);
+        }
+
         /// <inheritdoc cref="IMethodRequestBuilder.UsingMethod(MatchBehaviour, string[])"/>
         public IRequestBuilder UsingMethod(MatchBehaviour matchBehaviour, params string[] methods)
         {