Merge branch 'jws305-master'

Author: russcam

src/Nest/Aggregations/AggregateDictionary.cs

@@ -217,7 +217,6 @@ public AutoDateHistogramAggregate AutoDateHistogram(string key)
 			};
 		}
 
-
 		public CompositeBucketAggregate Composite(string key)
 		{
 			var bucket = TryGet<BucketAggregate>(key);
@@ -263,15 +262,14 @@ private MultiBucketAggregate<KeyedBucket<TKey>> GetMultiKeyedBucketAggregate<TKe
 			};
 		}
 
-
 		private IEnumerable<KeyedBucket<TKey>> GetKeyedBuckets<TKey>(IEnumerable<IBucket> items)
 		{
 			var buckets = items.Cast<KeyedBucket<object>>();
 
 			foreach (var bucket in buckets)
 				yield return new KeyedBucket<TKey>(bucket.BackingDictionary)
 				{
-					Key = (TKey)Convert.ChangeType(bucket.Key, typeof(TKey)),
+					Key = GetKeyFromBucketKey<TKey>(bucket.Key),
 					KeyAsString = bucket.KeyAsString,
 					DocCount = bucket.DocCount,
 					DocCountErrorUpperBound = bucket.DocCountErrorUpperBound
@@ -285,7 +283,7 @@ private IEnumerable<SignificantTermsBucket<TKey>> GetSignificantTermsBuckets<TKe
 			foreach (var bucket in buckets)
 				yield return new SignificantTermsBucket<TKey>(bucket.BackingDictionary)
 				{
-					Key = (TKey)Convert.ChangeType(bucket.Key, typeof(TKey)),
+					Key = GetKeyFromBucketKey<TKey>(bucket.Key),
 					BgCount = bucket.BgCount,
 					DocCount = bucket.DocCount,
 					Score = bucket.Score
@@ -299,9 +297,14 @@ private IEnumerable<RareTermsBucket<TKey>> GetRareTermsBuckets<TKey>(IEnumerable
 			foreach (var bucket in buckets)
 				yield return new RareTermsBucket<TKey>(bucket.BackingDictionary)
 				{
-					Key = (TKey)Convert.ChangeType(bucket.Key, typeof(TKey)),
+					Key = GetKeyFromBucketKey<TKey>(bucket.Key),
 					DocCount = bucket.DocCount.GetValueOrDefault(0)
 				};
 		}
+
+		private static TKey GetKeyFromBucketKey<TKey>(object key) =>
+			typeof(TKey).IsEnum
+				? (TKey)Enum.Parse(typeof(TKey), key.ToString(), true)
+				: (TKey)Convert.ChangeType(key, typeof(TKey));
 	}
 }

src/Tests/Tests/Aggregations/Bucket/Terms/TermsAggregationUsageTests.cs

@@ -188,15 +188,15 @@ public TermsAggregationIncludePatternUsageTests(ReadOnlyCluster i, EndpointUsage
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
 			response.ShouldBeValid();
-			var states = response.Aggregations.Terms("states");
+			var states = response.Aggregations.Terms<StateOfBeing>("states");
 			states.Should().NotBeNull();
 			states.DocCountErrorUpperBound.Should().HaveValue();
 			states.SumOtherDocCount.Should().HaveValue();
 			states.Buckets.Should().NotBeNull();
 			states.Buckets.Count.Should().BeGreaterThan(0);
 			foreach (var item in states.Buckets)
 			{
-				item.Key.Should().NotBeNullOrEmpty();
+				item.Key.Should().BeOfType<StateOfBeing>();
 				item.DocCount.Should().BeGreaterOrEqualTo(1);
 			}
 			states.Meta.Should().NotBeNull().And.HaveCount(1);