little tidy up

Author: russcam

src/Benchmarking/project.lock.json

@@ -7811,7 +7811,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
+      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Elasticsearch.Net/project.lock.json

@@ -1739,7 +1739,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
+      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -10,7 +10,7 @@ namespace Nest
 {
 	internal class AggregateJsonConverter : JsonConverter
 	{
-		private static Regex _numeric = new Regex(@"^[\d.]+(\.[\d.]+)?$");
+		private static readonly Regex _numeric = new Regex(@"^[\d.]+(\.[\d.]+)?$");
 
 		public override bool CanWrite => false;
 
@@ -40,6 +40,12 @@ private IAggregate ReadAggregation(JsonReader reader, JsonSerializer serializer)
 
 			var meta = (property == "meta") ? GetMetadata(reader) : null;
 
+			if (result != null)
+			{
+				result.Meta = meta;
+				return result;
+			}
+
 			property = reader.Value as string;
 
 			switch (property)
@@ -148,16 +154,15 @@ private IAggregate GetGeoBoundsMetric(JsonReader reader, JsonSerializer serializ
 				return null;
 			var geoBoundsMetric = new GeoBoundsAggregate();
 			JToken topLeftToken;
-			o.TryGetValue("top_left", out topLeftToken);
-			if (topLeftToken != null)
+			if (o.TryGetValue("top_left", out topLeftToken) && topLeftToken != null)
 			{
 				var topLeft = topLeftToken.ToObject<LatLon>();
 				if (topLeft != null)
 					geoBoundsMetric.Bounds.TopLeft = topLeft;
 			}
+
 			JToken bottomRightToken;
-			o.TryGetValue("bottom_right", out bottomRightToken);
-			if (bottomRightToken != null)
+			if (o.TryGetValue("bottom_right", out bottomRightToken) && bottomRightToken != null)
 			{
 				var bottomRight = bottomRightToken.ToObject<LatLon>();
 				if (bottomRight != null)
@@ -204,9 +209,7 @@ private IAggregate GetDocCountBucket(JsonReader reader, JsonSerializer serialize
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
 			var bucket = new SingleBucketAggregate { DocCount = docCount };
 			reader.Read();
-			if (reader.TokenType == JsonToken.PropertyName
-				&& ((string)reader.Value) == "buckets"
-				)
+			if (reader.TokenType == JsonToken.PropertyName && (string)reader.Value == "buckets")
 			{
 				var b = this.GetBucket(reader, serializer) as BucketAggregateData;
 				return new BucketAggregateData
@@ -489,17 +492,18 @@ public IBucketItem GetRangeItem(JsonReader reader, JsonSerializer serializer, st
 						break;
 				}
 			}
+
 			var bucket = new RangeItem
 			{
 				Key = key,
 				From = fromDouble,
 				To = toDouble,
 				DocCount = docCount.GetValueOrDefault(),
 				FromAsString = fromAsString,
-				ToAsString = toAsString
+				ToAsString = toAsString,
+				Aggregations = this.GetNestedAggregations(reader, serializer)
 			};
 
-			bucket.Aggregations = this.GetNestedAggregations(reader, serializer);
 			return bucket;
 		}
 
@@ -526,8 +530,7 @@ private IBucketItem GetKeyedBucketItem(JsonReader reader, JsonSerializer seriali
 			if (property == "from" || property == "to")
 				return GetRangeItem(reader, serializer, key);
 
-			var keyItem = new KeyedBucketItem();
-			keyItem.Key = key;
+			var keyItem = new KeyedBucketItem {Key = key};
 
 			if (property == "key_as_string")
 			{
@@ -574,8 +577,10 @@ private IBucketItem GetSignificantTermItem(JsonReader reader, JsonSerializer ser
 		private IBucketItem GetFiltersBucketItem(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
-			var filtersBucketItem = new FiltersBucketItem();
-			filtersBucketItem.DocCount = (reader.Value as long?).GetValueOrDefault(0);
+			var filtersBucketItem = new FiltersBucketItem
+			{
+				DocCount = (reader.Value as long?).GetValueOrDefault(0)
+			};
 			reader.Read();
 			filtersBucketItem.Aggregations = this.GetNestedAggregations(reader, serializer);
 			return filtersBucketItem;

src/Nest/Aggregations/AggregationsHelper.cs

@@ -5,7 +5,7 @@ namespace Nest
 {
 	public class AggregationsHelper
 	{
-		public IDictionary<string, IAggregate> Aggregations { get; internal protected set; }
+		public IDictionary<string, IAggregate> Aggregations { get; protected internal set; }
 
 		public AggregationsHelper() { }
 

src/Nest/Aggregations/Bucket/BucketAggregate.cs

@@ -5,8 +5,8 @@ namespace Nest
 {
 	public abstract class BucketAggregateBase : AggregationsHelper, IAggregate
 	{
-		public BucketAggregateBase() { }
-		public BucketAggregateBase(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
+		protected BucketAggregateBase() { }
+		protected BucketAggregateBase(IDictionary<string, IAggregate> aggregations) : base(aggregations) { }
 
 		public IDictionary<string, object> Meta { get; set; }
 	}

src/Nest/project.lock.json

@@ -2059,7 +2059,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
+      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",

src/Tests/project.lock.json

@@ -6406,7 +6406,7 @@
     "runtime.win7.System.Net.Requests/4.0.11-beta-23516": {
       "type": "package",
       "serviceable": true,
-      "sha512": "HI99nCEekL4SNvkLmpqkOE0PuEF5B6xyDcnJesdjo06BrGYH3QCvqJt2VmzBVe6hDSo6FnGOlhMvLdCUpDXiXA==",
+      "sha512": "mqWBQUhXhzkiwb+zVUuKg+wswJUsnQtZkFtz6eISw8vWNXA9i2jkzYjU3pjjIVmtdopnhle9YaS4a/w4OuWGLw==",
       "files": [
         "ref/dotnet/_._",
         "runtime.win7.System.Net.Requests.4.0.11-beta-23516.nupkg",