removed _partial support (to be replaced by source include and exclude)

Author: Mpdreamz

src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs

@@ -33,7 +33,10 @@ public IEnumerable<string> SkipQueryStringParams
 					"version",
 					"q", //we dont support GET searches
 					"fields",
-					"sort"
+					"sort",
+					"_source",
+					"_source_include",
+					"_source_exclude"
 				};
 			}
 		}

src/Nest/DSL/FluentDictionary.cs

@@ -1,7 +1,23 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Nest.Resolvers;
 
 namespace Nest
 {
+	public class FluentFieldList<T> : List<PropertyPathMarker> where T : class
+	{
+		public new FluentFieldList<T> Add(Expression<Func<T, object>> k)
+		{
+			base.Add(k);
+			return this;
+		}
+		public new FluentFieldList<T> Add(string k)
+		{
+			base.Add(k);
+			return this;
+		}
+	}
 	public class FluentDictionary<K, V> : Dictionary<K, V>
 	{
 		public FluentDictionary()

src/Nest/DSL/PartialFieldDescriptor.cs

@@ -280,9 +280,7 @@ internal RawOrFilterDescriptor<T> _FilterOrRaw
 		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
 		internal FluentDictionary<string, ScriptFilterDescriptor> _ScriptFields { get; set; }
 
-		[JsonProperty(PropertyName = "partial_fields")]
-		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
-		internal Dictionary<string, PartialFieldDescriptor<T>> _PartialFields { get; set; }
+
 
 		/// <summary>
 		/// The number of hits to return. Defaults to 10. When using scroll search type 
@@ -449,6 +447,16 @@ public SearchDescriptor<T> Fields(params Expression<Func<T, object>>[] expressio
 			this._Fields = expressions.Select(e => (PropertyPathMarker)e).ToList();
 			return this;
 		}
+		
+		/// <summary>
+		/// Allows to selectively load specific fields for each document 
+		/// represented by a search hit. Defaults to load the internal _source field.
+		/// </summary>
+		public SearchDescriptor<T> Fields(Func<FluentFieldList<T>, FluentFieldList<T>> properties)
+		{
+			this._Fields = properties(new FluentFieldList<T>()).ToList();
+			return this;
+		}
 		/// <summary>
 		/// Allows to selectively load specific fields for each document 
 		/// represented by a search hit. Defaults to load the internal _source field.
@@ -480,30 +488,6 @@ public SearchDescriptor<T> ScriptFields(
 			return this;
 		}
 
-		public SearchDescriptor<T> PartialFields(params Action<PartialFieldDescriptor<T>>[] partialFieldDescriptor)
-		{
-			if (this._PartialFields == null)
-				this._PartialFields = new Dictionary<string, PartialFieldDescriptor<T>>();
-
-			var descriptors = new List<PartialFieldDescriptor<T>>();
-
-			foreach (var selector in partialFieldDescriptor)
-			{
-				var filter = new PartialFieldDescriptor<T>();
-				selector(filter);
-				descriptors.Add(filter);
-			}
-
-			foreach (var d in descriptors)
-			{
-				var key = d._Field;
-				if (string.IsNullOrEmpty(key))
-					throw new DslException("Could not infer key for highlight field descriptor");
-
-				this._PartialFields.Add(key, d);
-			}
-			return this;
-		}
 
 		/// <summary>
 		/// <para>Allows to add one or more sort on specific fields. Each sort can be reversed as well.

src/Nest/DSL/SearchDescriptor.cs

@@ -4456,30 +4456,6 @@ public SearchDescriptor<T> Source(string source)
 		}
 
 
-		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
-		public SearchDescriptor<T> Source(params string[] _source)
-		{
-			this._QueryString.Source(_source);
-			return this;
-		}
-		
-
-		///<summary>A list of fields to exclude from the returned _source field</summary>
-		public SearchDescriptor<T> SourceExclude(params string[] _source_exclude)
-		{
-			this._QueryString.SourceExclude(_source_exclude);
-			return this;
-		}
-		
-
-		///<summary>A list of fields to extract and return from the _source field</summary>
-		public SearchDescriptor<T> SourceInclude(params string[] _source_include)
-		{
-			this._QueryString.SourceInclude(_source_include);
-			return this;
-		}
-		
-
 		///<summary>Specific &#39;tag&#39; of the request for logging and statistical purposes</summary>
 		public SearchDescriptor<T> Stats(params string[] stats)
 		{

src/Nest/DSL/_Descriptors.generated.cs

@@ -11,7 +11,7 @@
 
 namespace Nest.Domain
 {
-	public interface IFieldSelection<out T>
+	public interface IFieldSelection<T>
 	{
 
 	}

src/Nest/Domain/CovariantDictionary.cs

@@ -8,48 +8,47 @@
 namespace Nest
 {
 	//[JsonConverter(typeof(ConcreteTypeConverter))]
-    public interface IHit<out T> where T : class
-    {
-        IFieldSelection<T> Fields { get; }
-        T Source { get; }
-        string Index { get; }
-        double Score { get; }
-        string Type { get; }
-        string Version { get; }
-        string Id { get; }
+	public interface IHit<out T> where T : class
+	{
+		//IFieldSelection<T> Fields { get; }
+		T Source { get; }
+		string Index { get; }
+		double Score { get; }
+		string Type { get; }
+		string Version { get; }
+		string Id { get; }
 
-        IEnumerable<object> Sorts { get; }
+		IEnumerable<object> Sorts { get; }
 
 		HighlightFieldDictionary Highlights { get; }
-        Explanation Explanation { get; }
-        ICovariantDictionary<T> PartialFields { get; }
-    }
+		Explanation Explanation { get; }
+	}
 
-    [JsonObject]
-    public class Hit<T> : IHit<T>
-        where T : class
-    {
-        [JsonProperty(PropertyName = "fields")]
+	[JsonObject]
+	public class Hit<T> : IHit<T>
+		where T : class
+	{
+		[JsonProperty(PropertyName = "fields")]
 		internal IDictionary<string, object> _fields { get; set; }
 		[JsonIgnore]
-        public IFieldSelection<T> Fields { get; internal set; }
-        [JsonProperty(PropertyName = "_source")]
-        public T Source { get; internal set; }
-        [JsonProperty(PropertyName = "_index")]
-        public string Index { get; internal set; }
-        [JsonProperty(PropertyName = "_score")]
-        public double Score { get; internal set; }
-        [JsonProperty(PropertyName = "_type")]
-        public string Type { get; internal set; }
-        [JsonProperty(PropertyName = "_version")]
-        public string Version { get; internal set; }
-        [JsonProperty(PropertyName = "_id")]
-        public string Id { get; internal set; }
+		public FieldSelection<T> Fields { get; internal set; }
+		[JsonProperty(PropertyName = "_source")]
+		public T Source { get; internal set; }
+		[JsonProperty(PropertyName = "_index")]
+		public string Index { get; internal set; }
+		[JsonProperty(PropertyName = "_score")]
+		public double Score { get; internal set; }
+		[JsonProperty(PropertyName = "_type")]
+		public string Type { get; internal set; }
+		[JsonProperty(PropertyName = "_version")]
+		public string Version { get; internal set; }
+		[JsonProperty(PropertyName = "_id")]
+		public string Id { get; internal set; }
 
-        [JsonProperty(PropertyName = "sort")]
-        public IEnumerable<object> Sorts { get; internal set; }
+		[JsonProperty(PropertyName = "sort")]
+		public IEnumerable<object> Sorts { get; internal set; }
 
-        [JsonProperty(PropertyName = "highlight")]
+		[JsonProperty(PropertyName = "highlight")]
 		[JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))]
 		internal Dictionary<string, List<string>> _Highlight { get; set; }
 
@@ -65,21 +64,14 @@ public HighlightFieldDictionary Highlights
 					DocumentId = this.Id,
 					Field = kv.Key,
 					Highlights = kv.Value
-				}).ToDictionary(k=>k.Field, v=>v);
+				}).ToDictionary(k => k.Field, v => v);
 
 				return new HighlightFieldDictionary(highlights);
-			} 
+			}
 		}
 
 		[JsonProperty(PropertyName = "_explanation")]
 		public Explanation Explanation { get; internal set; }
 
-        
-        public ICovariantDictionary<T> PartialFields { get; internal set; }
-
-        public Hit()
-        {
-
-        }
-    }
+	}
 }

src/Nest/Domain/FieldSelection.cs

@@ -93,6 +93,7 @@ public IEnumerable<T> Documents
 				}
 			}
 		}
+		
 		[JsonIgnore]
 		public IEnumerable<IHit<T>> Hits
 		{
@@ -107,7 +108,6 @@ public IEnumerable<IHit<T>> Hits
 			}
 		}
 
-
 		public F Facet<F>(Expression<Func<T, object>> expression) where F : class, IFacet
 		{
 			var fieldName = this.ConnectionStatus.Infer.PropertyPath(expression);

src/Nest/Domain/Hit/Hit.cs

@@ -125,10 +125,7 @@ public IQueryResponse<TResult> DeserializeSearchResponse<T, TResult>(ConnectionS
 		{
 			var types = (originalSearchDescriptor._Types ?? Enumerable.Empty<TypeNameMarker>())
 				.Where(t => t.Type != null);
-			var partialFields = originalSearchDescriptor._PartialFields.EmptyIfNull().Select(x => x.Key);
-			if (originalSearchDescriptor._ConcreteTypeSelector == null && (
-				types.Any(t => t.Type != typeof(TResult)))
-				|| partialFields.Any())
+			if (originalSearchDescriptor._ConcreteTypeSelector == null && types.Any(t => t.Type != typeof(TResult)))
 			{
 				var inferrer = new ElasticInferrer(this._settings);
 				var typeDictionary = types
@@ -148,7 +145,7 @@ public IQueryResponse<TResult> DeserializeSearchResponse<T, TResult>(ConnectionS
 
 			return this.DeserializeInternal<QueryResponse<TResult>>(
 				status,
-				piggyBackJsonConverter: new ConcreteTypeConverter<TResult>(originalSearchDescriptor._ConcreteTypeSelector, partialFields)
+				piggyBackJsonConverter: new ConcreteTypeConverter<TResult>(originalSearchDescriptor._ConcreteTypeSelector)
 			);
 		}