Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Author: Mpdreamz

Diff for: src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs

@@ -179,6 +179,14 @@ private IAggregation GetKeyedBucketItem(JsonReader reader, JsonSerializer serial
 
 			var keyItem = new KeyItem();
 			keyItem.Key = key.ToString();
+
+			if (property == "key_as_string")
+			{
+				// Skip key_as_string property for backwards compatibility (< ES 1.2)
+				reader.Read();
+				reader.Read();
+			}
+
 			reader.Read(); //doc_count;
 			var docCount = reader.Value as long?;
 			keyItem.DocCount = docCount.GetValueOrDefault(0);

Diff for: src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -179,6 +179,7 @@
     <Compile Include="Reproduce\Reproduce211Tests.cs" />
     <Compile Include="Reproduce\Reproduce654Tests.cs" />
     <Compile Include="Reproduce\Reproduce659Tests.cs" />
+    <Compile Include="Reproduce\Reproduce730Tests.cs" />
     <Compile Include="Reproduce\ReproduceConnectionStallsTests.cs" />
     <Compile Include="Search\FieldTests\FieldsTest.cs" />
     <Compile Include="Search\NamedFilter\NamedFilterTests.cs" />

Diff for: src/Tests/Nest.Tests.Integration/Reproduce/Reproduce730Tests.cs

@@ -0,0 +1,30 @@
+using FluentAssertions;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest.Tests.Integration.Reproduce
+{
+	[TestFixture]
+	public class Reproduce730Tests : IntegrationTests
+	{
+		[Test]
+		public void TermAggIntegerAsKeyProducesNullKeyItem()
+		{
+			var result = this._client.Search<ElasticsearchProject>(s => s
+				.Aggregations(a => a
+					.Terms("my_term_agg", t => t
+						.Field(o => o.DoubleValue))));
+
+			result.IsValid.Should().BeTrue();
+			var myTermAgg = result.Aggs.Terms("my_term_agg");
+			myTermAgg.Items.Count.Should().BeGreaterThan(0);
+			myTermAgg.Items[0].Key.Should().NotBeNull();
+			myTermAgg.Items[0].DocCount.Should().BeGreaterThan(0);
+		}
+	}
+}