Merge branch 'fix/fieldvalues'

Author: gmarz

src/Nest/CommonAbstractions/Fields/FieldSelection.cs

@@ -0,0 +1,58 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	[JsonConverter(typeof(FieldValuesJsonConverter))]
+	public class FieldValues : IsADictionary<string, object>
+	{
+		private ElasticInferrer _inferrer;
+
+		public FieldValues(ElasticInferrer inferrer, IDictionary<string, object> container) 
+			: base(container)
+		{
+			_inferrer = inferrer;
+		}
+
+		public K ValueOf<K>(Field field) => ValuesOf<K>(field).FirstOrDefault();
+
+		public K ValueOf<T, K>(Expression<Func<T, object>> objectPath) 
+			where T : class => ValuesOf<T, K>(objectPath).FirstOrDefault();
+
+		public K[] ValuesOf<K>(Field field)
+		{
+			var path = this._inferrer.Field(field);
+			return this.FieldArray<K[]>(path);
+		}
+
+		public K[] ValuesOf<T, K>(Expression<Func<T, object>> objectPath)
+			where T : class
+		{
+			var field = this._inferrer.Field(objectPath);
+			return this.FieldArray<K[]>(field);
+		}
+
+		private K FieldArray<K>(string field)
+		{
+			object o;
+			if (this.BackingDictionary != null && this.BackingDictionary.TryGetValue(field, out o))
+			{
+				var t = typeof(K);
+				if (o is JArray && t.GetInterfaces().Contains(typeof(IEnumerable)))
+				{
+					var array = (JArray)o;
+					return array.ToObject<K>();
+				}
+				return (K)Convert.ChangeType(o, typeof(K));
+			}
+			return default(K);
+		}
+	}
+}

src/Nest/CommonAbstractions/Fields/FieldValues.cs

@@ -0,0 +1,34 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest
+{
+	internal class FieldValuesJsonConverter : JsonConverter
+	{
+		public override bool CanWrite => false;
+
+		public override bool CanConvert(Type objectType)
+		{
+			throw new NotImplementedException();
+		}
+
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+		{
+			var o = JObject.Load(reader);
+			var fields = o.Properties().ToDictionary(p => p.Name, p => p.Value.ToObject<object>());
+			var inferrer = serializer.GetConnectionSettings().Inferrer;
+			var fieldValues = new FieldValues(inferrer, fields);
+			return fieldValues;
+		}
+
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}

src/Nest/CommonAbstractions/Fields/FieldValuesJsonConverter.cs

@@ -47,7 +47,7 @@ internal class FieldsSetter
 		//This method is used through reflection (cached though)
 		// do not remove
 		private static void SetFields<TFieldsType>(
-			Hit<TFieldsType> hit, FieldSelection<TFieldsType> fieldSelection)
+			Hit<TFieldsType> hit, FieldValues fieldSelection)
 			where TFieldsType : class
 		{
 			hit.Fields = fieldSelection;
@@ -80,7 +80,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
 			var instance = (Hit<T>)(typeof(Hit<T>).CreateInstance());
 			serializer.Populate(reader, instance);
-			instance.Fields = new FieldSelection<T>(serializer.GetConnectionSettings().Inferrer, instance._fields);
+			instance.Fields = new FieldValues(serializer.GetConnectionSettings().Inferrer, instance.Fields);
 			return instance;
 		}
 
@@ -159,12 +159,11 @@ internal static Type GetConcreteTypeUsingSelector<T>(
 			//Hit<dynamic> hitDynamic = new Hit<dynamic>();
 			dynamic d = jObject;
 			var fields = jObject["fields"];
-			var fieldSelectionData = fields?.ToObject<IDictionary<string, object>>();
-			var sel = new FieldSelection<T>(settings.Inferrer, fieldSelectionData);
+			var fieldsDictionary = fields?.ToObject<IDictionary<string, object>>();
+			var fieldValues = new FieldValues(settings.Inferrer, fieldsDictionary);
 			var hitDynamic = new Hit<dynamic>();
 			//favor manual mapping over doing Populate twice.
-			hitDynamic._fields = fieldSelectionData;
-			hitDynamic.Fields = sel;
+			hitDynamic.Fields = fieldValues;
 			hitDynamic.Source = d._source;
 			hitDynamic.Index = d._index;
 			hitDynamic.Score = d._score;
@@ -174,16 +173,16 @@ internal static Type GetConcreteTypeUsingSelector<T>(
 			hitDynamic.Sorts = d.sort;
 			hitDynamic._Highlight = d.highlight is Dictionary<string, List<string>> ? d.highlight : null;
 			hitDynamic.Explanation = d._explanation is Explanation ? d._explanation : null;
-			object o = d._source ?? DynamicResponse.Create(fieldSelectionData) ?? new object {};
+			object o = d._source ?? DynamicResponse.Create(fieldsDictionary) ?? new object {};
 			var concreteType = selector(o, hitDynamic);
 
 			Type fieldSelectionType;
 			if (!ConcreteTypeConverter.TypeToFieldTypes.TryGetValue(concreteType, out fieldSelectionType))
 			{
-				fieldSelectionType = typeof(FieldSelection<>).MakeGenericType(concreteType);
+				fieldSelectionType = typeof(FieldValues).MakeGenericType(concreteType);
 				ConcreteTypeConverter.TypeToFieldTypes.TryAdd(concreteType, fieldSelectionType);
 			}
-			selection = fieldSelectionType.CreateInstance(settings, fieldSelectionData);
+			selection = fieldSelectionType.CreateInstance(settings, fieldsDictionary);
 			return concreteType;
 		}
 	}

src/Nest/CommonAbstractions/Fields/FluentFieldList.cs

@@ -21,7 +21,7 @@ public interface IMultiGetHit<out T> where T : class
 	public class MultiGetHit<T> : IMultiGetHit<T>
 		where T : class
 	{
-		public IFieldSelection<T> FieldSelection { get; internal set; }
+		public FieldValues Fields { get; internal set; }
 
 		[JsonProperty(PropertyName = "_source")]
 		public T Source { get; internal set; }

src/Nest/CommonAbstractions/SerializationBehavior/StatefulDeserialization/ConcreteTypeConverter.cs

@@ -41,12 +41,11 @@ private static void CreateMultiHit<T>(MultiHitTuple tuple, JsonSerializer serial
 			serializer.Populate(reader, hit);
 
 			var settings = serializer.GetConnectionSettings();
-			var f = new FieldSelection<T>(settings.Inferrer);
 			var source = tuple.Hit["fields"];
 			if (source != null)
 			{
-				((IFieldSelection<T>)f).FieldValuesDictionary = serializer.Deserialize<Dictionary<string, object>>(source.CreateReader());
-				hit.FieldSelection = f;
+				var fieldsDictionary = serializer.Deserialize<Dictionary<string, object>>(source.CreateReader());
+				hit.Fields = new FieldValues(settings.Inferrer, fieldsDictionary);
 			}
 
 			collection.Add(hit);

src/Nest/Document/Multiple/MultiGet/Response/MultiGetHit.cs

@@ -12,8 +12,8 @@ public interface IMultiGetResponse : IResponse
 		MultiGetHit<T> Get<T>(long id) where T : class;
 		T Source<T>(string id) where T : class;
 		T Source<T>(long id) where T : class;
-		IFieldSelection<T> GetFieldSelection<T>(string id) where T : class;
-		IFieldSelection<T> GetFieldSelection<T>(long id) where T : class;
+		FieldValues GetFieldValues<T>(string id) where T : class;
+		FieldValues GetFieldSelection<T>(long id) where T : class;
 		IEnumerable<T> SourceMany<T>(IEnumerable<string> ids) where T : class;
 		IEnumerable<T> SourceMany<T>(IEnumerable<long> ids) where T : class;
 		IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<string> ids) where T : class;
@@ -78,16 +78,16 @@ public IEnumerable<IMultiGetHit<T>> GetMany<T>(IEnumerable<long> ids) where T :
 		{
 			return this.GetMany<T>(ids.Select(i=>i.ToString(CultureInfo.InvariantCulture)));
 		}
-		public IFieldSelection<T> GetFieldSelection<T>(string id) where T : class
+		public FieldValues GetFieldValues<T>(string id) where T : class
 		{
 			var multiHit = this.Get<T>(id);
 			if (multiHit == null)
 				return null;
-			return multiHit.FieldSelection;
+			return multiHit.Fields;
 		}
-		public IFieldSelection<T> GetFieldSelection<T>(long id) where T : class
+		public FieldValues GetFieldSelection<T>(long id) where T : class
 		{
-			return this.GetFieldSelection<T>(id.ToString(CultureInfo.InvariantCulture));
+			return this.GetFieldValues<T>(id.ToString(CultureInfo.InvariantCulture));
 		}
 	}
 }

src/Nest/Document/Multiple/MultiGet/Response/MultiGetHitJsonConverter.cs

@@ -37,7 +37,6 @@ public IGetResponse<T> Get<T>(DocumentPath<T> document, Func<GetDescriptor<T>, I
 		public IGetResponse<T> Get<T>(IGetRequest request) where T : class =>
 			this.Dispatcher.Dispatch<IGetRequest, GetRequestParameters, GetResponse<T>>(
 				request,
-				(r, s) => DeserializeGetResponse<T>(s),
 				(p, d) => this.LowLevelDispatch.GetDispatch<GetResponse<T>>(p)
 			);
 
@@ -49,16 +48,7 @@ public Task<IGetResponse<T>> GetAsync<T>(DocumentPath<T> document, Func<GetDescr
 		public Task<IGetResponse<T>> GetAsync<T>(IGetRequest request) where T : class =>
 			this.Dispatcher.DispatchAsync<IGetRequest, GetRequestParameters, GetResponse<T>, IGetResponse<T>>(
 				request,
-				(r, s) => DeserializeGetResponse<T>(s),
 				(p, d) => this.LowLevelDispatch.GetDispatchAsync<GetResponse<T>>(p)
 			);
-
-		private GetResponse<T> DeserializeGetResponse<T>(Stream stream)
-			where T : class
-		{
-			var response = Serializer.Deserialize<GetResponse<T>>(stream);
-			response.Inferrer = this.ConnectionSettings.Inferrer;
-			return response;
-		}
 	}
 }