Merge branch 'fix/aggs1.5' into develop

Author: Mpdreamz

src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs

@@ -116,15 +116,23 @@ private IAggregation GetPercentilesMetricAggregation(JsonReader reader, JsonSeri
 				reader.Read();
 			while (reader.TokenType != JsonToken.EndObject)
 			{
-				var percentile = double.Parse(reader.Value as string, CultureInfo.InvariantCulture);
-				reader.Read();
-				var value = reader.Value as double?;
-				percentileItems.Add(new PercentileItem()
+				if ((reader.Value as string).Contains("_as_string"))
 				{
-					Percentile = percentile,
-					Value = value.GetValueOrDefault(0)
-				});
-				reader.Read();
+					reader.Read();
+					reader.Read();
+				}
+				if (reader.TokenType != JsonToken.EndObject)
+				{
+					var percentile = double.Parse(reader.Value as string, CultureInfo.InvariantCulture);
+					reader.Read();
+					var value = reader.Value as double?;
+					percentileItems.Add(new PercentileItem()
+					{
+						Percentile = percentile,
+						Value = value.GetValueOrDefault(0)
+					});
+					reader.Read();
+				}
 			}
 			metric.Items = percentileItems;
 			if (!oldFormat) reader.Read();
@@ -168,56 +176,72 @@ private IAggregation GetStatsAggregation(JsonReader reader, JsonSerializer seria
 			reader.Read(); reader.Read();
 			var sum = (reader.Value as double?);
 
+			var statsMetric = new StatsMetric()
+			{
+				Average = average,
+				Count = count,
+				Max = max,
+				Min = min,
+				Sum = sum
+			};
+
 			reader.Read();
+
 			if (reader.TokenType == JsonToken.EndObject)
-				return new StatsMetric()
-				{
-					Average = average,
-					Count = count,
-					Max = max,
-					Min = min,
-					Sum = sum
-				};
+				return statsMetric;
+
+			while (reader.TokenType != JsonToken.EndObject && (reader.Value as string).Contains("_as_string"))
+			{
+				reader.Read();
+				reader.Read();
+			}
+
+			if (reader.TokenType == JsonToken.EndObject)
+				return statsMetric;
+
+			return GetExtendedStatsAggregation(statsMetric, reader);
+		}
+
+		private IAggregation GetExtendedStatsAggregation(StatsMetric statsMetric, JsonReader reader)
+		{
+			var extendedStatsMetric = new ExtendedStatsMetric()
+			{
+				Average = statsMetric.Average,
+				Count = statsMetric.Count,
+				Max = statsMetric.Max,
+				Min = statsMetric.Min,
+				Sum = statsMetric.Sum
+			};
 
 			reader.Read();
-			var sumOfSquares = (reader.Value as double?);
-			reader.Read(); reader.Read();
-			var variance = (reader.Value as double?);
+			extendedStatsMetric.SumOfSquares = (reader.Value as double?);
+			reader.Read(); 
+			reader.Read();
+			extendedStatsMetric.Variance = (reader.Value as double?);
 			reader.Read(); reader.Read();
-			var stdDeviation = (reader.Value as double?);
+			extendedStatsMetric.StdDeviation = (reader.Value as double?);
 			reader.Read();
 
-			StandardDeviationBounds stdDeviationBounds = null;
 			if (reader.TokenType != JsonToken.EndObject)
 			{
-				stdDeviationBounds = new StandardDeviationBounds();
+				var bounds = new StandardDeviationBounds();
 				reader.Read();
 				reader.Read();
 				if ((reader.Value as string) == "upper")
 				{
 					reader.Read();
-					stdDeviationBounds.Upper = reader.Value as double?;
+					bounds.Upper = reader.Value as double?;
 				}
 				reader.Read();
 				if ((reader.Value as string) == "lower")
 				{
 					reader.Read();
-					stdDeviationBounds.Lower = reader.Value as double?;
+					bounds.Lower = reader.Value as double?;
 				}
+				extendedStatsMetric.StdDeviationBounds = bounds;
 			}
 
-			return new ExtendedStatsMetric()
-			{
-				Average = average,
-				Count = count,
-				Max = max,
-				Min = min,
-				StdDeviation = stdDeviation,
-				Sum = sum,
-				SumOfSquares = sumOfSquares,
-				Variance = variance,
-				StdDeviationBounds = stdDeviationBounds
-			};
+			return extendedStatsMetric;
 		}
 
 		private IAggregation GetDateHistogramAggregation(JsonReader reader, JsonSerializer serializer)
@@ -379,6 +403,11 @@ private IAggregation GetValueMetricOrAggregation(JsonReader reader, JsonSerializ
 			if (valueMetric.Value != null)
 			{
 				reader.Read();
+				if (reader.TokenType != JsonToken.EndObject)
+				{
+					reader.Read();
+					reader.Read();
+				}
 				return valueMetric;
 			}
 

src/Tests/Nest.Tests.Integration/Core/Map/Mapping/MappingTransformTests.cs

@@ -49,6 +49,7 @@ public void MultipleTransformTest()
 				)
 				.Transform(t => t
 					.Script("ctx._source['suggest'] = ctx._source['content']")
+					.Language("groovy") //mandatory since elasticsearch 1.5
 				)
 			);
 			this.DefaultResponseAssertations(putResult);

src/Tests/Nest.Tests.Integration/Core/TermVectors/TermVectorTests.cs

@@ -100,7 +100,7 @@ public void TermVectorNonMappedFieldTest()
 		{
 			var result = Client.TermVector<ElasticsearchProject>(s => s
 				.Id("1")
-				.Fields(ep => ep.Name));
+				.Fields("blahblah"));
 
 			result.IsValid.Should().BeTrue();
 			result.TermVectors.Count().ShouldBeEquivalentTo(0);

src/Tests/Nest.Tests.Integration/Reproduce/Reproduce994Tests.cs

@@ -13,6 +13,7 @@ namespace Nest.Tests.Integration.Reproduce
 	public class Reproduce994Tests : IntegrationTests
 	{
 		[Test]
+		[Ignore]
 		public void DateTimeRangeItemsAreReturnedProperly()
 		{
 			var fixedDateString = "2014-03-01T00:00:00.000Z";