Align methods with class names

Author: gmarz

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -14,7 +14,7 @@ internal class AggregateJsonConverter : JsonConverter
 
 		public override bool CanWrite => false;
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) => this.ReadAggregation(reader, serializer);
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) => this.ReadAggregate(reader, serializer);
 
 		public override bool CanConvert(Type objectType) => objectType == typeof(IAggregate);
 
@@ -23,7 +23,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			throw new NotSupportedException();
 		}
 
-		private IAggregate ReadAggregation(JsonReader reader, JsonSerializer serializer)
+		private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
@@ -32,18 +32,18 @@ private IAggregate ReadAggregation(JsonReader reader, JsonSerializer serializer)
 			if (reader.TokenType != JsonToken.PropertyName)
 				return null;
 
-			IAggregate result = null;
+			IAggregate aggregate = null;
 
 			var property = reader.Value as string;
 			if (_numeric.IsMatch(property))
-				result = GetPercentilesMetric(reader, serializer, oldFormat: true);
+				aggregate = GetPercentilesAggregate(reader, serializer, oldFormat: true);
 
 			var meta = (property == "meta") ? GetMetadata(reader) : null;
 
-			if (result != null)
+			if (aggregate != null)
 			{
-				result.Meta = meta;
-				return result;
+				aggregate.Meta = meta;
+				return aggregate;
 			}
 
 			property = reader.Value as string;
@@ -53,35 +53,35 @@ private IAggregate ReadAggregation(JsonReader reader, JsonSerializer serializer)
 				case "values":
 					reader.Read();
 					reader.Read();
-					result = GetPercentilesMetric(reader, serializer);
+					aggregate = GetPercentilesAggregate(reader, serializer);
 					break;
 				case "value":
-					result = GetValueMetric(reader, serializer);
+					aggregate = GetValueAggregate(reader, serializer);
 					break;
 				case "buckets":
 				case "doc_count_error_upper_bound":
-					result = GetBucket(reader, serializer);
+					aggregate = GetMultiBucketAggregate(reader, serializer);
 					break;;
 				case "count":
-					result = GetStatsMetric(reader, serializer);
+					aggregate = GetStatsAggregate(reader, serializer);
 					break;
 				case "doc_count":
-					result = GetDocCountBucket(reader, serializer);
+					aggregate = GetSingleBucketAggregate(reader, serializer);
 					break;
 				case "bounds":
-					result = GetGeoBoundsMetric(reader, serializer);
+					aggregate = GetGeoBoundsAggregate(reader, serializer);
 					break;
 				case "hits":
-					result = GetTopHitsMetric(reader, serializer);
+					aggregate = GetTopHitsAggregate(reader, serializer);
 					break;
 				default:
 					return null;
 			}
-			result.Meta = meta;
-			return result;
+			aggregate.Meta = meta;
+			return aggregate;
 		}
 
-		private IBucket ReadBucketItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket ReadBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.StartObject)
 				return null;
@@ -97,17 +97,17 @@ private IBucket ReadBucketItem(JsonReader reader, JsonSerializer serializer)
 			switch (property)
 			{
 				case "key":
-					item = GetKeyedBucketItem(reader, serializer);
+					item = GetKeyedBucket(reader, serializer);
 					break;
 				case "from":
 				case "to":
-					item = GetRangeItem(reader, serializer);
+					item = GetRangeBucket(reader, serializer);
 					break;
 				case "key_as_string":
-					item = GetDateHistrogramItem(reader, serializer);
+					item = GetDateHistogramBucket(reader, serializer);
 					break;
 				case "doc_count":
-					item = GetFiltersBucketItem(reader, serializer);
+					item = GetFiltersBucket(reader, serializer);
 					break;
 				default:
 					return null;
@@ -132,7 +132,7 @@ private Dictionary<string, object> GetMetadata(JsonReader reader)
 			return meta;
 		}
 
-		private IAggregate GetTopHitsMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetTopHitsAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var o = JObject.Load(reader);
@@ -146,7 +146,7 @@ private IAggregate GetTopHitsMetric(JsonReader reader, JsonSerializer serializer
 			return new TopHitsAggregate(hits, serializer) { Total = total, MaxScore = maxScore };
 		}
 
-		private IAggregate GetGeoBoundsMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetGeoBoundsAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var o = JObject.Load(reader);
@@ -172,7 +172,7 @@ private IAggregate GetGeoBoundsMetric(JsonReader reader, JsonSerializer serializ
 			return geoBoundsMetric;
 		}
 
-		private IAggregate GetPercentilesMetric(JsonReader reader, JsonSerializer serializer, bool oldFormat = false)
+		private IAggregate GetPercentilesAggregate(JsonReader reader, JsonSerializer serializer, bool oldFormat = false)
 		{
 			var metric = new PercentilesAggregate();
 			var percentileItems = new List<PercentileItem>();
@@ -203,28 +203,28 @@ private IAggregate GetPercentilesMetric(JsonReader reader, JsonSerializer serial
 			return metric;
 		}
 
-		private IAggregate GetDocCountBucket(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetSingleBucketAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			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")
 			{
-				var b = this.GetBucket(reader, serializer) as BucketAggregate;
+				var b = this.GetMultiBucketAggregate(reader, serializer) as BucketAggregate;
 				return new BucketAggregate
 				{
 					DocCount = docCount,
 					Items = b.Items
 				};
 			}
 
-			bucket.Aggregations = this.GetNestedAggregations(reader, serializer);
+			bucket.Aggregations = this.GetSubAggregates(reader, serializer);
 
 			return bucket;
 		}
 
-		private IAggregate GetStatsMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetStatsAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var count = (reader.Value as long?).GetValueOrDefault(0);
@@ -260,10 +260,10 @@ private IAggregate GetStatsMetric(JsonReader reader, JsonSerializer serializer)
 			if (reader.TokenType == JsonToken.EndObject)
 				return statsMetric;
 
-			return GetExtendedStatsAggregation(statsMetric, reader);
+			return GetExtendedStatsAggregate(statsMetric, reader);
 		}
 
-		private IAggregate GetExtendedStatsAggregation(StatsAggregate statsMetric, JsonReader reader)
+		private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonReader reader)
 		{
 			var extendedStatsMetric = new ExtendedStatsAggregate()
 			{
@@ -319,7 +319,7 @@ private IAggregate GetExtendedStatsAggregation(StatsAggregate statsMetric, JsonR
 			return extendedStatsMetric;
 		}
 
-		private IDictionary<string, IAggregate> GetNestedAggregations(JsonReader reader, JsonSerializer serializer)
+		private IDictionary<string, IAggregate> GetSubAggregates(JsonReader reader, JsonSerializer serializer)
 		{
 			if (reader.TokenType != JsonToken.PropertyName)
 				return null;
@@ -330,7 +330,7 @@ private IDictionary<string, IAggregate> GetNestedAggregations(JsonReader reader,
 			{
 				var fieldName = reader.Value as string;
 				reader.Read();
-				var agg = this.ReadAggregation(reader, serializer);
+				var agg = this.ReadAggregate(reader, serializer);
 				nestedAggs.Add(fieldName, agg);
 				reader.Read();
 				if (reader.Depth == currentDepth && reader.TokenType == JsonToken.EndObject || reader.Depth < currentDepth)
@@ -339,7 +339,7 @@ private IDictionary<string, IAggregate> GetNestedAggregations(JsonReader reader,
 			return nestedAggs;
 		}
 
-		private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			var bucket = new BucketAggregate();
 			var property = reader.Value as string;
@@ -367,7 +367,7 @@ private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 				{
 					var name = reader.Value.ToString();
 					reader.Read();
-					var innerAgg = this.ReadAggregation(reader, serializer);
+					var innerAgg = this.ReadAggregate(reader, serializer);
 					aggs.Add(name, innerAgg);
 					reader.Read();
 				} while (reader.TokenType != JsonToken.EndObject);
@@ -387,7 +387,7 @@ private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 			}
 			do
 			{
-				var item = this.ReadBucketItem(reader, serializer);
+				var item = this.ReadBucket(reader, serializer);
 				items.Add(item);
 				reader.Read();
 			} while (reader.TokenType != JsonToken.EndArray);
@@ -396,7 +396,7 @@ private IAggregate GetBucket(JsonReader reader, JsonSerializer serializer)
 			return bucket;
 		}
 
-		private IAggregate GetValueMetric(JsonReader reader, JsonSerializer serializer)
+		private IAggregate GetValueAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var valueMetric = new ValueAggregate()
@@ -447,7 +447,7 @@ private IAggregate GetValueMetric(JsonReader reader, JsonSerializer serializer)
 			return valueMetric;
 		}
 
-		public IBucket GetRangeItem(JsonReader reader, JsonSerializer serializer, string key = null)
+		public IBucket GetRangeBucket(JsonReader reader, JsonSerializer serializer, string key = null)
 		{
 			string fromAsString = null, toAsString = null;
 			long? docCount = null;
@@ -501,13 +501,13 @@ public IBucket GetRangeItem(JsonReader reader, JsonSerializer serializer, string
 				DocCount = docCount.GetValueOrDefault(),
 				FromAsString = fromAsString,
 				ToAsString = toAsString,
-				Aggregations = this.GetNestedAggregations(reader, serializer)
+				Aggregations = this.GetSubAggregates(reader, serializer)
 			};
 
 			return bucket;
 		}
 
-		private IBucket GetDateHistrogramItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket GetDateHistogramBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			var keyAsString = reader.ReadAsString();
 			reader.Read(); reader.Read();
@@ -517,18 +517,18 @@ private IBucket GetDateHistrogramItem(JsonReader reader, JsonSerializer serializ
 			reader.Read();
 
 			var dateHistogram = new DateHistogramBucket() { Key = key, KeyAsString = keyAsString, DocCount = docCount };
-			dateHistogram.Aggregations = this.GetNestedAggregations(reader, serializer);
+			dateHistogram.Aggregations = this.GetSubAggregates(reader, serializer);
 			return dateHistogram;
 
 		}
 
-		private IBucket GetKeyedBucketItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			var key = reader.ReadAsString();
 			reader.Read();
 			var property = reader.Value as string;
 			if (property == "from" || property == "to")
-				return GetRangeItem(reader, serializer, key);
+				return GetRangeBucket(reader, serializer, key);
 
 			var keyItem = new KeyedBucket {Key = key};
 
@@ -546,16 +546,16 @@ private IBucket GetKeyedBucketItem(JsonReader reader, JsonSerializer serializer)
 			var nextProperty = reader.Value as string;
 			if (nextProperty == "score")
 			{
-				return GetSignificantTermItem(reader, serializer, keyItem);
+				return GetSignificantTermsBucket(reader, serializer, keyItem);
 			}
 
 
-			keyItem.Aggregations = this.GetNestedAggregations(reader, serializer);
+			keyItem.Aggregations = this.GetSubAggregates(reader, serializer);
 			return keyItem;
 
 		}
 
-		private IBucket GetSignificantTermItem(JsonReader reader, JsonSerializer serializer, KeyedBucket keyItem)
+		private IBucket GetSignificantTermsBucket(JsonReader reader, JsonSerializer serializer, KeyedBucket keyItem)
 		{
 			reader.Read();
 			var score = reader.Value as double?;
@@ -570,19 +570,19 @@ private IBucket GetSignificantTermItem(JsonReader reader, JsonSerializer seriali
 				Score = score.GetValueOrDefault(0)
 			};
 			reader.Read();
-			significantTermItem.Aggregations = this.GetNestedAggregations(reader, serializer);
+			significantTermItem.Aggregations = this.GetSubAggregates(reader, serializer);
 			return significantTermItem;
 		}
 
-		private IBucket GetFiltersBucketItem(JsonReader reader, JsonSerializer serializer)
+		private IBucket GetFiltersBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var filtersBucketItem = new FiltersBucketItem
 			{
 				DocCount = (reader.Value as long?).GetValueOrDefault(0)
 			};
 			reader.Read();
-			filtersBucketItem.Aggregations = this.GetNestedAggregations(reader, serializer);
+			filtersBucketItem.Aggregations = this.GetSubAggregates(reader, serializer);
 			return filtersBucketItem;
 		}
 	}