fix #2155 if JArray infers a date time on a string it parses it to datetime, if the user wants the original string representation they are out of luck because json.net will only yield a cultural to string on the Date JTokenTimes

Author: Mpdreamz

src/Nest/CommonAbstractions/Fields/FieldValues.cs

@@ -1,12 +1,11 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Nest
 {
@@ -51,6 +50,12 @@ public K[] Values<T, K>(Expression<Func<T, K>> objectPath)
 			return this.FieldArray<K[]>(field);
 		}
 
+
+		private static JsonSerializer ForceNoDateInferrence = new JsonSerializer
+		{
+			DateParseHandling = DateParseHandling.None
+		};
+
 		private K FieldArray<K>(string field)
 		{
 			object o;
@@ -60,6 +65,19 @@ private K FieldArray<K>(string field)
 				if (o is JArray && t.GetInterfaces().Contains(typeof(IEnumerable)))
 				{
 					var array = (JArray)o;
+					if (typeof(K) == typeof(string[]) && array.Count > 0 && array.Any(p=>p.Type == JTokenType.Date))
+					{
+						// https://github.com/elastic/elasticsearch-net/issues/2155
+						// o of type JArray has already decided the values are dates so there is no
+						// way around this.
+						// incredibly ugly and sad but the only way I found to cover this edgecase
+						var s = array.Root.ToString();
+						using (var sr = new StringReader(s))
+						using (var jr = new JsonTextReader(sr) { DateParseHandling = DateParseHandling.None })
+							return ForceNoDateInferrence.Deserialize<K>(jr);
+
+						return array.Root.ToObject<K>(ForceNoDateInferrence);
+					}
 					return array.ToObject<K>();
 				}
 				return (K)Convert.ChangeType(o, typeof(K));

src/Tests/Framework/MockData/Project.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Bogus;
 using Nest;
@@ -14,6 +15,7 @@ public class Project
 		public string Description { get; set; }
 		public StateOfBeing State { get; set; }
 		public DateTime StartedOn { get; set; }
+		public string DateString { get; set; }
 		public DateTime LastActivity { get; set; }
 		public Developer LeadDeveloper { get; set; }
 		public IEnumerable<Tag> Tags { get; set; }
@@ -29,6 +31,7 @@ public class Project
 				.RuleFor(p => p.Description, f => f.Lorem.Paragraphs(3))
 				.RuleFor(p => p.State, f => f.PickRandom<StateOfBeing>())
 				.RuleFor(p => p.StartedOn, p => p.Date.Past())
+				.RuleFor(p => p.DateString, (p, d) => d.StartedOn.ToString("yyyy-MM-ddTHH\\:mm\\:ss.fffffffzzz"))
 				.RuleFor(p => p.LastActivity, p => p.Date.Recent())
 				.RuleFor(p => p.LeadDeveloper, p => Developer.Developers[Gimme.Random.Number(0, Developer.Developers.Count -1)])
 				.RuleFor(p => p.Tags, f => Tag.Generator.Generate(Gimme.Random.Number(2, 50)))
@@ -60,6 +63,7 @@ public class Project
 			Name = Projects.First().Name,
 			LeadDeveloper = new Developer() { FirstName = "Martijn", LastName = "Laarman" },
 			StartedOn = new DateTime(2015, 1, 1),
+			DateString = new DateTime(2015, 1, 1).ToString(CultureInfo.InvariantCulture),
 			Location = new SimpleGeoPoint { Lat = 42.1523, Lon = -80.321 }
 		};
 
@@ -69,6 +73,7 @@ public class Project
 			state = "BellyUp",
 			startedOn = "2015-01-01T00:00:00",
 			lastActivity = "0001-01-01T00:00:00",
+			dateString = "2015-01-01T00:00:00",
 			leadDeveloper = new { gender = "Male", id = 0, firstName = "Martijn", lastName = "Laarman" },
 			location = new { lat = Instance.Location.Lat, lon = Instance.Location.Lon }
 		};

src/Tests/Search/Request/FieldsUsageTests.cs

@@ -12,8 +12,8 @@ namespace Tests.Search.Request
 {
 	/** Allows to selectively load specific stored fields for each document represented by a search hit.
 	*
-	* WARNING: The `fields` parameter is about fields that are explicitly marked as stored in the mapping, 
-	* which is off by default and generally not recommended. 
+	* WARNING: The `fields` parameter is about fields that are explicitly marked as stored in the mapping,
+	* which is off by default and generally not recommended.
 	* Use <<source-filtering-usage,source filtering>> instead to select subsets of the original source document to be returned.
 	*
 	* See the Elasticsearch documentation on {ref_current}/search-request-fields.html[Fields] for more detail.
@@ -31,12 +31,13 @@ public FieldsUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(clu
 			.Fields(fs => fs
 				.Field(p => p.Name)
 				.Field(p => p.StartedOn)
+				.Field(p => p.DateString)
 			);
 
 		protected override SearchRequest<Project> Initializer =>
 			new SearchRequest<Project>
 			{
-				Fields = Fields<Project>(p => p.Name, p => p.StartedOn)
+				Fields = Fields<Project>(p => p.Name, p => p.StartedOn, p => p.DateString)
 			};
 
 		[I] protected Task FieldsAreReturned() => this.AssertOnAllResponses(r =>
@@ -45,12 +46,16 @@ [I] protected Task FieldsAreReturned() => this.AssertOnAllResponses(r =>
 			r.Fields.Count().Should().BeGreaterThan(0);
 			foreach (var fieldValues in r.Fields)
 			{
-				fieldValues.Count().Should().Be(2);
+				fieldValues.Count().Should().Be(3);
 				var name = fieldValues.Value<string>(Field<Project>(p => p.Name));
 				name.Should().NotBeNullOrWhiteSpace();
 
 				var dateTime = fieldValues.ValueOf<Project, DateTime>(p => p.StartedOn);
 				dateTime.Should().BeAfter(default(DateTime));
+
+				var dateTimeAsString = fieldValues.ValueOf<Project, string>(p => p.DateString);
+				dateTimeAsString.Should().NotContain("/")
+					.And.MatchRegex(@"^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d.*$");
 			}
 		});
 	}

src/Tests/tests.yaml

@@ -1,7 +1,7 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
 mode: u
 # the elasticsearch version that should be started
-elasticsearch_version: 2.3.1
+elasticsearch_version: 2.3.4
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
 # do not spawn nodes as part of the test setup but rely on a manually started es node being up