Merge pull request #1241 from jekstrom/develop

Add support for lenient property for multi match query.

Author: gmarz

src/Nest/DSL/Query/MultiMatchQueryDescriptor.cs

@@ -44,6 +44,9 @@ public interface IMultiMatchQuery : IQuery
 		[JsonProperty(PropertyName = "boost")]
 		double? Boost { get; set; }
 
+		[JsonProperty(PropertyName = "lenient")]
+		bool? Lenient { get; set; }
+
 		[JsonProperty(PropertyName = "use_dis_max")]
 		bool? UseDisMax { get; set; }
 
@@ -79,6 +82,7 @@ protected override void WrapInContainer(IQueryContainer container)
 		public int? MaxExpansions { get; set; }
 		public int? Slop { get; set; }
 		public double? Boost { get; set; }
+		public bool? Lenient { get; set; }
 		public bool? UseDisMax { get; set; }
 		public double? TieBreaker { get; set; }
 		public string MinimumShouldMatch { get; set; }
@@ -109,6 +113,8 @@ public class MultiMatchQueryDescriptor<T> : IMultiMatchQuery where T : class
 
 		double? IMultiMatchQuery.Boost { get; set; }
 
+		bool? IMultiMatchQuery.Lenient { get; set; }
+
 		bool? IMultiMatchQuery.UseDisMax { get; set; }
 
 		double? IMultiMatchQuery.TieBreaker { get; set; }
@@ -193,6 +199,12 @@ public MultiMatchQueryDescriptor<T> Boost(double boost)
 			((IMultiMatchQuery)this).Boost = boost;
 			return this;
 		}
+
+		public MultiMatchQueryDescriptor<T> Lenient(bool lenient = true) {
+			((IMultiMatchQuery)this).Lenient = lenient;
+			return this;
+		}
+
 		public MultiMatchQueryDescriptor<T> PrefixLength(int prefixLength)
 		{
 			((IMultiMatchQuery)this).PrefixLength = prefixLength;

src/Tests/Nest.Tests.Unit/QueryParsers/Queries/MultiMatchQueryTests.cs

@@ -14,6 +14,7 @@ public void MultiMatch_Deserializes()
 				f=>f.MultiMatch(mq=>mq
 					.Analyzer("my-analyzer")
 					.Boost(2.5)
+					.Lenient()
 					.CutoffFrequency(0.8)
 					.Fuzziness(0.8)
 					.MaxExpansions(2)
@@ -29,6 +30,7 @@ public void MultiMatch_Deserializes()
 				);
 			q.Analyzer.Should().Be("my-analyzer");
 			q.Boost.Should().Be(2.5);
+			q.Lenient.Should().BeTrue();
 			q.CutoffFrequency.Should().Be(0.8);
 			q.Fuzziness.Should().Be(0.8);
 			q.MaxExpansions.Should().Be(2);