Merge pull request #1949 from elastic/fix/simple-fields-overloads

gmarz · gmarz · commit 7a5145a278e4 · 2016-03-23T14:56:08.000-04:00
fix #1870 allow .Fields(Fields) everywhere
diff --git a/src/Nest/Document/Multiple/MultiGet/Request/MultiGetOperation.cs b/src/Nest/Document/Multiple/MultiGet/Request/MultiGetOperation.cs
@@ -27,7 +27,7 @@ public MultiGetOperation(Id id)
 		public string Routing { get; set; }
 
 		bool IMultiGetOperation.CanBeFlattened =>
-			this.Index == null 
+			this.Index == null
 			&& this.Type == null
 			&& this.Routing == null
 			&& this.Source == null
@@ -106,11 +106,13 @@ public MultiGetOperationDescriptor<T> Source(Func<SourceFilterDescriptor<T>, ISo
 		public MultiGetOperationDescriptor<T> Routing(string routing) => Assign(a => a.Routing = routing);
 
 		/// <summary>
-		/// Allows to selectively load specific fields for each document 
+		/// Allows to selectively load specific fields for each document
 		/// represented by a search hit. Defaults to load the internal _source field.
 		/// </summary>
 		public MultiGetOperationDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public MultiGetOperationDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 	}
-}
+}
diff --git a/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorOperation.cs b/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorOperation.cs
@@ -29,8 +29,8 @@ public interface IMultiTermVectorOperation
 		ITermVectorFilter Filter { get; set; }
 	}
 
-	public class MultiTermVectorOperation<T> : IMultiTermVectorOperation 
-		where T : class 
+	public class MultiTermVectorOperation<T> : IMultiTermVectorOperation
+		where T : class
 	{
 		public MultiTermVectorOperation(Id id)
 		{
@@ -52,7 +52,7 @@ public MultiTermVectorOperation(Id id)
 		public ITermVectorFilter Filter { get; set; }
 	}
 
-	public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation>, IMultiTermVectorOperation 
+	public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation>, IMultiTermVectorOperation
 		where T : class
 	{
 		IndexName IMultiTermVectorOperation.Index { get; set; } = typeof (T);
@@ -70,6 +70,8 @@ public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVec
 		public MultiTermVectorOperationDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public MultiTermVectorOperationDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 		public MultiTermVectorOperationDescriptor<T> Id(Id id) => Assign(a=>a.Id = id);
 
 		public MultiTermVectorOperationDescriptor<T> Offsets(bool offsets = true) => Assign(a => a.Offsets = offsets);
@@ -82,7 +84,7 @@ public MultiTermVectorOperationDescriptor<T> Fields(Func<FieldsDescriptor<T>, IP
 
 		public MultiTermVectorOperationDescriptor<T> FieldStatistics(bool fieldStatistics = true) => Assign(a => a.FieldStatistics = fieldStatistics);
 
-		public MultiTermVectorOperationDescriptor<T> Filter(Func<TermVectorFilterDescriptor, ITermVectorFilter> filterSelector) => 
+		public MultiTermVectorOperationDescriptor<T> Filter(Func<TermVectorFilterDescriptor, ITermVectorFilter> filterSelector) =>
 			Assign(a => a.Filter = filterSelector?.Invoke(new TermVectorFilterDescriptor()));
 	}
-}
+}
diff --git a/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs b/src/Nest/QueryDsl/FullText/MultiMatch/MultiMatchQuery.cs
@@ -85,8 +85,8 @@ public class MultiMatchQuery : QueryBase, IMultiMatchQuery
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	public class MultiMatchQueryDescriptor<T> 
-		: QueryDescriptorBase<MultiMatchQueryDescriptor<T>, IMultiMatchQuery> 
+	public class MultiMatchQueryDescriptor<T>
+		: QueryDescriptorBase<MultiMatchQueryDescriptor<T>, IMultiMatchQuery>
 		, IMultiMatchQuery where T : class
 	{
 		protected override bool Conditionless => MultiMatchQuery.IsConditionless(this);
@@ -110,6 +110,8 @@ public class MultiMatchQueryDescriptor<T>
 		public MultiMatchQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public MultiMatchQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 		public MultiMatchQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
 		public MultiMatchQueryDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
diff --git a/src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs b/src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs
@@ -124,7 +124,7 @@ public class QueryStringQuery : QueryBase, IQueryStringQuery
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	public class QueryStringQueryDescriptor<T> 
+	public class QueryStringQueryDescriptor<T>
 		: QueryDescriptorBase<QueryStringQueryDescriptor<T>, IQueryStringQuery>
 		, IQueryStringQuery where T : class
 	{
@@ -163,6 +163,8 @@ public class QueryStringQueryDescriptor<T>
 		public QueryStringQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public QueryStringQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 		public QueryStringQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
 		public QueryStringQueryDescriptor<T> Locale(string locale) => Assign(a => a.Locale = locale);
diff --git a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs
@@ -27,7 +27,7 @@ public interface ISimpleQueryStringQuery : IQuery
 
 		[JsonProperty(PropertyName = "lowercase_expanded_terms")]
 		bool? LowercaseExpendedTerms { get; set; }
-		
+
 		[JsonProperty(PropertyName = "lenient")]
 		bool? Lenient { get; set; }
 
@@ -56,8 +56,8 @@ public class SimpleQueryStringQuery : QueryBase, ISimpleQueryStringQuery
 		internal static bool IsConditionless(ISimpleQueryStringQuery q) => q.Query.IsNullOrEmpty();
 	}
 
-	public class SimpleQueryStringQueryDescriptor<T> 
-		: QueryDescriptorBase<SimpleQueryStringQueryDescriptor<T>, ISimpleQueryStringQuery> 
+	public class SimpleQueryStringQueryDescriptor<T>
+		: QueryDescriptorBase<SimpleQueryStringQueryDescriptor<T>, ISimpleQueryStringQuery>
 		, ISimpleQueryStringQuery where T : class
 	{
 		protected override bool Conditionless => SimpleQueryStringQuery.IsConditionless(this);
@@ -75,6 +75,8 @@ public class SimpleQueryStringQueryDescriptor<T>
 		public SimpleQueryStringQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public SimpleQueryStringQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 		public SimpleQueryStringQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);
 
 		public SimpleQueryStringQueryDescriptor<T> Analyzer(string analyzer) => Assign(a => a.Analyzer = analyzer);
diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs
@@ -62,7 +62,7 @@ public abstract class LikeDocumentBase : ILikeDocument
 	public class LikeDocument<T> : LikeDocumentBase
 	{
 		protected override Type ClrType => typeof(T);
-		internal LikeDocument() { } 
+		internal LikeDocument() { }
 
 		public LikeDocument(Id id)
 		{
@@ -107,10 +107,12 @@ public LikeDocumentDescriptor()
 		public LikeDocumentDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public LikeDocumentDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 		public LikeDocumentDescriptor<T> Document(T document) => Assign(a => a.Document = document);
 
 		public LikeDocumentDescriptor<T> PerFieldAnalyzer(Func<PerFieldAnalyzerDescriptor<T>, IPromise<IPerFieldAnalyzer>> analyzerSelector) =>
 				Assign(a => a.PerFieldAnalyzer = analyzerSelector?.Invoke(new PerFieldAnalyzerDescriptor<T>())?.Value);
 
 	}
-}
+}
diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs
@@ -41,7 +41,7 @@ public interface IMoreLikeThisQuery : IQuery
 
 		[JsonProperty(PropertyName = "analyzer")]
 		string Analyzer { get; set; }
-		
+
 		[JsonProperty(PropertyName = "minimum_should_match")]
 		MinimumShouldMatch MinimumShouldMatch { get; set; }
 
@@ -77,7 +77,7 @@ public class MoreLikeThisQuery : QueryBase, IMoreLikeThisQuery
 		internal static bool IsConditionless(IMoreLikeThisQuery q) => q.Fields.IsConditionless() || (!q.Like.HasAny() || q.Like.All(Nest.Like.IsConditionless));
 	}
 
-	public class MoreLikeThisQueryDescriptor<T> 
+	public class MoreLikeThisQueryDescriptor<T>
 		: QueryDescriptorBase<MoreLikeThisQueryDescriptor<T>, IMoreLikeThisQuery>
 		, IMoreLikeThisQuery where T : class
 	{
@@ -100,13 +100,15 @@ public class MoreLikeThisQueryDescriptor<T>
 		public MoreLikeThisQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
-		public MoreLikeThisQueryDescriptor<T> StopWords(IEnumerable<string> stopWords) => 
+		public MoreLikeThisQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
+		public MoreLikeThisQueryDescriptor<T> StopWords(IEnumerable<string> stopWords) =>
 			Assign(a => a.StopWords = stopWords.ToListOrNullIfEmpty());
 
-		public MoreLikeThisQueryDescriptor<T> StopWords(params string[] stopWords) => 
+		public MoreLikeThisQueryDescriptor<T> StopWords(params string[] stopWords) =>
 			Assign(a => a.StopWords = stopWords);
 
-		public MoreLikeThisQueryDescriptor<T> StopWords(StopWords stopWords) => 
+		public MoreLikeThisQueryDescriptor<T> StopWords(StopWords stopWords) =>
 			Assign(a => a.StopWords = stopWords);
 
 		public MoreLikeThisQueryDescriptor<T> MaxQueryTerms(int? maxQueryTerms) => Assign(a => a.MaxQueryTerms = maxQueryTerms);
diff --git a/src/Nest/Search/Search/SearchRequest.cs b/src/Nest/Search/Search/SearchRequest.cs
@@ -362,6 +362,8 @@ public SearchDescriptor<T> IndicesBoost(Func<FluentDictionary<IndexName, double>
 		public SearchDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>
 			Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);
 
+		public SearchDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);
+
 		///<summary>
 		///A comma-separated list of fields to return as the field data representation of a field for each hit
 		///</summary>
diff --git a/src/Tests/QueryDsl/FullText/MultiMatch/MultiMatchUsageTests.cs b/src/Tests/QueryDsl/FullText/MultiMatch/MultiMatchUsageTests.cs
@@ -107,7 +107,8 @@ public MultiMatchWithBoostUsageTests(ReadOnlyCluster i, EndpointUsage usage) : b
 
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MultiMatch(c => c
-				.Fields(f => f.Field(p=>p.Description, 2.2).Field("myOtherField^0.3"))
+				//.Fields(f => f.Field(p=>p.Description, 2.2).Field("myOtherField^0.3"))
+				.Fields(Field<Project>(p=>p.Description, 2.2).And("myOtherField^0.3"))
 				.Query("hello world")
 			);
 	}

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public interface IMultiTermVectorOperation`
`29`	`29`	`ITermVectorFilter Filter { get; set; }`
`30`	`30`	`}`
`31`	`31`
`32`		`- public class MultiTermVectorOperation<T> : IMultiTermVectorOperation`
`33`		`- where T : class`
	`32`	`+ public class MultiTermVectorOperation<T> : IMultiTermVectorOperation`
	`33`	`+ where T : class`
`34`	`34`	`{`
`35`	`35`	`public MultiTermVectorOperation(Id id)`
`36`	`36`	`{`
`@@ -52,7 +52,7 @@ public MultiTermVectorOperation(Id id)`
`52`	`52`	`public ITermVectorFilter Filter { get; set; }`
`53`	`53`	`}`
`54`	`54`
`55`		`- public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation>, IMultiTermVectorOperation`
	`55`	`+ public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVectorOperationDescriptor<T>, IMultiTermVectorOperation>, IMultiTermVectorOperation`
`56`	`56`	`where T : class`
`57`	`57`	`{`
`58`	`58`	`IndexName IMultiTermVectorOperation.Index { get; set; } = typeof (T);`
`@@ -70,6 +70,8 @@ public class MultiTermVectorOperationDescriptor<T> : DescriptorBase<MultiTermVec`
`70`	`70`	`public MultiTermVectorOperationDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>`
`71`	`71`	`Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);`
`72`	`72`
	`73`	`+ public MultiTermVectorOperationDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);`
	`74`	`+`
`73`	`75`	`public MultiTermVectorOperationDescriptor<T> Id(Id id) => Assign(a=>a.Id = id);`
`74`	`76`
`75`	`77`	`public MultiTermVectorOperationDescriptor<T> Offsets(bool offsets = true) => Assign(a => a.Offsets = offsets);`
`@@ -82,7 +84,7 @@ public MultiTermVectorOperationDescriptor<T> Fields(Func<FieldsDescriptor<T>, IP`
`82`	`84`
`83`	`85`	`public MultiTermVectorOperationDescriptor<T> FieldStatistics(bool fieldStatistics = true) => Assign(a => a.FieldStatistics = fieldStatistics);`
`84`	`86`
`85`		`- public MultiTermVectorOperationDescriptor<T> Filter(Func<TermVectorFilterDescriptor, ITermVectorFilter> filterSelector) =>`
	`87`	`+ public MultiTermVectorOperationDescriptor<T> Filter(Func<TermVectorFilterDescriptor, ITermVectorFilter> filterSelector) =>`
`86`	`88`	`Assign(a => a.Filter = filterSelector?.Invoke(new TermVectorFilterDescriptor()));`
`87`	`89`	`}`
`88`		`-}`
	`90`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public class QueryStringQuery : QueryBase, IQueryStringQuery`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`[JsonObject(MemberSerialization = MemberSerialization.OptIn)]`
`127`		`- public class QueryStringQueryDescriptor<T>`
	`127`	`+ public class QueryStringQueryDescriptor<T>`
`128`	`128`	`: QueryDescriptorBase<QueryStringQueryDescriptor<T>, IQueryStringQuery>`
`129`	`129`	`, IQueryStringQuery where T : class`
`130`	`130`	`{`
`@@ -163,6 +163,8 @@ public class QueryStringQueryDescriptor<T>`
`163`	`163`	`public QueryStringQueryDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>`
`164`	`164`	`Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);`
`165`	`165`
	`166`	`+ public QueryStringQueryDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);`
	`167`	`+`
`166`	`168`	`public QueryStringQueryDescriptor<T> Query(string query) => Assign(a => a.Query = query);`
`167`	`169`
`168`	`170`	`public QueryStringQueryDescriptor<T> Locale(string locale) => Assign(a => a.Locale = locale);`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public abstract class LikeDocumentBase : ILikeDocument`
`62`	`62`	`public class LikeDocument<T> : LikeDocumentBase`
`63`	`63`	`{`
`64`	`64`	`protected override Type ClrType => typeof(T);`
`65`		`- internal LikeDocument() { }`
	`65`	`+ internal LikeDocument() { }`
`66`	`66`
`67`	`67`	`public LikeDocument(Id id)`
`68`	`68`	`{`
`@@ -107,10 +107,12 @@ public LikeDocumentDescriptor()`
`107`	`107`	`public LikeDocumentDescriptor<T> Fields(Func<FieldsDescriptor<T>, IPromise<Fields>> fields) =>`
`108`	`108`	`Assign(a => a.Fields = fields?.Invoke(new FieldsDescriptor<T>())?.Value);`
`109`	`109`
	`110`	`+ public LikeDocumentDescriptor<T> Fields(Fields fields) => Assign(a => a.Fields = fields);`
	`111`	`+`
`110`	`112`	`public LikeDocumentDescriptor<T> Document(T document) => Assign(a => a.Document = document);`
`111`	`113`
`112`	`114`	`public LikeDocumentDescriptor<T> PerFieldAnalyzer(Func<PerFieldAnalyzerDescriptor<T>, IPromise<IPerFieldAnalyzer>> analyzerSelector) =>`
`113`	`115`	`Assign(a => a.PerFieldAnalyzer = analyzerSelector?.Invoke(new PerFieldAnalyzerDescriptor<T>())?.Value);`
`114`	`116`
`115`	`117`	`}`
`116`		`-}`
	`118`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,8 @@ public MultiMatchWithBoostUsageTests(ReadOnlyCluster i, EndpointUsage usage) : b`
`107`	`107`
`108`	`108`	`protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q`
`109`	`109`	`.MultiMatch(c => c`
`110`		`- .Fields(f => f.Field(p=>p.Description, 2.2).Field("myOtherField^0.3"))`
	`110`	`+ //.Fields(f => f.Field(p=>p.Description, 2.2).Field("myOtherField^0.3"))`
	`111`	`+ .Fields(Field<Project>(p=>p.Description, 2.2).And("myOtherField^0.3"))`
`111`	`112`	`.Query("hello world")`
`112`	`113`	`);`
`113`	`114`	`}`