Merge branch 'TruffleMuffin-develop' into develop

Author: gmarz

Diff for: src/Nest/DSL/Filter/FilterDescriptor.cs

@@ -520,6 +520,7 @@ public FilterContainer Terms(Expression<Func<T, object>> fieldDescriptor, IEnume
 			ITermsFilter filter = new TermsFilterDescriptor();
 			filter.Field = fieldDescriptor;
 			filter.Terms = terms;
+		    filter.Execution = Execution;
 			return this.New(filter, f=>f.Terms = filter);
 		}
 
@@ -531,6 +532,7 @@ public FilterContainer Terms(string field, IEnumerable<string> terms, TermsExecu
 			ITermsFilter filter = new TermsFilterDescriptor();
 			filter.Field = field;
 			filter.Terms = terms ?? Enumerable.Empty<string>();
+            filter.Execution = Execution;
 			return this.New(filter, f=>f.Terms = filter);
 		}
 

Diff for: src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs

@@ -55,5 +55,7 @@ public class ElasticsearchProject
 
 		[ElasticProperty(Type=FieldType.Object)]
 		public Product Product { get; set; }
+
+        public string[] MyStringArrayField { get; set; }
 	}
 }

Diff for: src/Tests/Nest.Tests.Unit/Search/Filter/Singles/TermsFilterJson.cs

@@ -52,6 +52,52 @@ public void TermsFilterWithCache()
 			Assert.True(json.JsonEquals(expected), json);
 		}
 
+        [Test]
+        public void TermsFilter_EnumerableOfStringOverLoad_WithNonDefaultExecutionSpecified_AppliesExecution()
+        {
+            var s = new SearchDescriptor<ElasticsearchProject>()
+                .From(0)
+                .Size(10)
+                .Filter(ff => ff
+                    .Terms(f => f.MyStringArrayField, new[] { "elasticsearch.pm" }, Execution: TermsExecution.Bool)
+                );
+
+            var json = TestElasticClient.Serialize(s);
+            var expected = @"{ from: 0, size: 10, 
+				filter : {
+						terms: {
+							""myStringArrayField"": [""elasticsearch.pm""],
+							execution: ""bool""
+						}
+
+					}
+			}";
+            Assert.True(json.JsonEquals(expected), json);
+        }
+
+        [Test]
+        public void TermsFilter_NonLambdaField_WithNonDefaultExecutionSpecified_AppliesExecution()
+        {
+            var s = new SearchDescriptor<ElasticsearchProject>()
+                .From(0)
+                .Size(10)
+                .Filter(ff => ff
+                    .Terms("myStringArrayField", new[] { "elasticsearch.pm" }, Execution: TermsExecution.Bool)
+                );
+
+            var json = TestElasticClient.Serialize(s);
+            var expected = @"{ from: 0, size: 10, 
+				filter : {
+						terms: {
+							""myStringArrayField"": [""elasticsearch.pm""],
+							execution: ""bool""
+						}
+
+					}
+			}";
+            Assert.True(json.JsonEquals(expected), json);
+        }
+
 		[Test]
 		public void TermsFilterWithConditionlessQueryWithCache()
 		{

Diff for: src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs

@@ -201,7 +201,8 @@ public void TestFieldsWithExclusionsByProperty()
 			""stupidIntIWantAsLong"",
 			""myAttachment"",
 			""myBinaryField"",
-			""product""
+			""product"",
+            ""myStringArrayField""
 		  ]
 		}";
 		  Assert.True(json.JsonEquals(expected));