Term() on filter now generic on argument like Term() on query, saves on ToString()'ing in client's code. related to #347

Author: Mpdreamz

src/Nest.Tests.Integration/Integration/Filter/AndOrNotFilterTests.cs

@@ -83,12 +83,12 @@ public void TestOrFilter()
 		public void TestNotFilter()
 		{
 			this.DoFilterTest(
-				f => f.Not(n => n.Term(o => o.Id, (_LookFor.Id + 1).ToString())),
+				f => f.Not(n => n.Term(o => o.Id, (_LookFor.Id + 1))),
 				_LookFor,
 				true);
 
 			this.DoFilterTest(
-				f => f.Not(n => n.Term(o => o.Id, _LookFor.Id.ToString())),
+				f => f.Not(n => n.Term(o => o.Id, _LookFor.Id)),
 				_LookFor,
 				false);
 		}

src/Nest.Tests.Integration/IntegrationTests.cs

@@ -35,7 +35,7 @@ public void DoFilterTest(Func<FilterDescriptor<ElasticSearchProject>, Nest.BaseF
 
 			var results = this._client.Search<ElasticSearchProject>(
 				s => s.Filter(ff => ff.And(
-						f => f.Term(e => e.Id, project.Id.ToString()),
+						f => f.Term(e => e.Id, project.Id),
 						filter
 					))
 				);

src/Nest/DSL/FilterDescriptor.cs

@@ -675,7 +675,7 @@ public BaseFilter Prefix(string field, string prefix)
 		/// Filters documents that have fields that contain a term (not analyzed). 
 		/// Similar to term query, except that it acts as a filter
 		/// </summary>
-		public BaseFilter Term(Expression<Func<T, object>> fieldDescriptor, string term)
+		public BaseFilter Term<K>(Expression<Func<T, K>> fieldDescriptor, K term)
 		{
 			var field = new PropertyNameResolver().Resolve(fieldDescriptor);
 			return this.Term(field, term);
@@ -684,10 +684,12 @@ public BaseFilter Term(Expression<Func<T, object>> fieldDescriptor, string term)
 		/// Filters documents that have fields that contain a term (not analyzed).
 		/// Similar to term query, except that it acts as a filter
 		/// </summary>
-		public BaseFilter Term(string field, string term)
+		public BaseFilter Term<K>(string field, K term)
 		{
-			if (term.IsNullOrEmpty() || field.IsNullOrEmpty())
+			var t = new Term() { Field = field, Value = (object)term };
+			if (t.IsConditionless)
 				return CreateConditionlessFilterDescriptor("term", new { term = term, field = field });
+
 			return this.SetDictionary("term", field, term, (d, b) =>
 			{
 				b.TermFilter = d;

src/Nest/DSL/IFilterDescriptor.cs

@@ -41,8 +41,8 @@ interface IFilterDescriptor<T>
 		BaseFilter Query(Func<QueryDescriptor<T>, BaseQuery> querySelector);
 		BaseFilter Range(Action<RangeFilterDescriptor<T>> rangeSelector);
 		BaseFilter Script(Action<ScriptFilterDescriptor> scriptSelector);
-		BaseFilter Term(Expression<Func<T, object>> fieldDescriptor, string term);
-		BaseFilter Term(string field, string term);
+		BaseFilter Term<K>(Expression<Func<T, K>> fieldDescriptor, K term);
+		BaseFilter Term<K>(string field, K term);
 		BaseFilter Terms(Expression<Func<T, object>> fieldDescriptor, IEnumerable<string> terms, TermsExecution? Execution = null);
 		BaseFilter Terms(string field, IEnumerable<string> terms, TermsExecution? Execution = null);
 		BaseFilter Type(string type);