NEST is now also CLSCompliant, fixed several _Property style classes still around

Author: Mpdreamz

src/Elasticsearch.Net/Properties/ClsCompliancy.cs

@@ -1,19 +1,4 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17626
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
+using System;
 
 [assembly: CLSCompliant(true)]
 

src/Nest/DSL/Aggregations/SignificantTermsAggregationDescriptor.cs

@@ -11,106 +11,106 @@ namespace Nest
 	public interface ISignificantTermsAggregator : IBucketAggregator
 	{
 		[JsonProperty("field")]
-		PropertyPathMarker _Field { get; set; }
+		PropertyPathMarker Field { get; set; }
 
 		[JsonProperty("size")]
-		int? _Size { get; set; }
+		int? Size { get; set; }
 
 		[JsonProperty("shard_size")]
-		int? _ShardSize { get; set; }
+		int? ShardSize { get; set; }
 
 		[JsonProperty("min_doc_count")]
-		int? _MinimumDocumentCount { get; set; }
+		int? MinimumDocumentCount { get; set; }
 
 		[JsonProperty("execution_hit")]
-		TermsAggregationExecutionHint? _ExecutionHint { get; set; }
+		TermsAggregationExecutionHint? ExecutionHint { get; set; }
 
 		[JsonProperty("include")]
-		IDictionary<string, string> _Include { get; set; }
+		IDictionary<string, string> Include { get; set; }
 
 		[JsonProperty("exclude")]
-		IDictionary<string, string> _Exclude { get; set; }
+		IDictionary<string, string> Exclude { get; set; }
 	}
 
 	public class SignificantTermsAggregator : BucketAggregator, ISignificantTermsAggregator
 	{
-		public PropertyPathMarker _Field { get; set; }
-		public int? _Size { get; set; }
-		public int? _ShardSize { get; set; }
-		public int? _MinimumDocumentCount { get; set; }
-		public TermsAggregationExecutionHint? _ExecutionHint { get; set; }
-		public IDictionary<string, string> _Include { get; set; }
-		public IDictionary<string, string> _Exclude { get; set; }
+		public PropertyPathMarker Field { get; set; }
+		public int? Size { get; set; }
+		public int? ShardSize { get; set; }
+		public int? MinimumDocumentCount { get; set; }
+		public TermsAggregationExecutionHint? ExecutionHint { get; set; }
+		public IDictionary<string, string> Include { get; set; }
+		public IDictionary<string, string> Exclude { get; set; }
 	}
 
 	public class SignificantTermsAggregationDescriptor<T> : BucketAggregationBaseDescriptor<SignificantTermsAggregationDescriptor<T>, T>, ISignificantTermsAggregator where T : class
 	{
 		private ISignificantTermsAggregator Self { get { return this; } }
 
-		PropertyPathMarker ISignificantTermsAggregator._Field { get; set; }
+		PropertyPathMarker ISignificantTermsAggregator.Field { get; set; }
 
-		int? ISignificantTermsAggregator._Size { get; set; }
+		int? ISignificantTermsAggregator.Size { get; set; }
 
-		int? ISignificantTermsAggregator._ShardSize { get; set; }
+		int? ISignificantTermsAggregator.ShardSize { get; set; }
 
-		int? ISignificantTermsAggregator._MinimumDocumentCount { get; set; }
+		int? ISignificantTermsAggregator.MinimumDocumentCount { get; set; }
 
-		TermsAggregationExecutionHint? ISignificantTermsAggregator._ExecutionHint { get; set; }
+		TermsAggregationExecutionHint? ISignificantTermsAggregator.ExecutionHint { get; set; }
 
-		IDictionary<string, string> ISignificantTermsAggregator._Include { get; set; }
+		IDictionary<string, string> ISignificantTermsAggregator.Include { get; set; }
 
-		IDictionary<string, string> ISignificantTermsAggregator._Exclude { get; set; }
+		IDictionary<string, string> ISignificantTermsAggregator.Exclude { get; set; }
 
 		public SignificantTermsAggregationDescriptor<T> Field(string field)
 		{
-			Self._Field = field;
+			Self.Field = field;
 			return this;
 		}
 
 		public SignificantTermsAggregationDescriptor<T> Field(Expression<Func<T, object>> field)
 		{
-			Self._Field = field;
+			Self.Field = field;
 			return this;
 		}
 
 
 		public SignificantTermsAggregationDescriptor<T> Size(int size)
 		{
-			Self._Size = size;
+			Self.Size = size;
 			return this;
 		}
 
 		public SignificantTermsAggregationDescriptor<T> ShardSize(int shardSize)
 		{
-			Self._ShardSize = shardSize;
+			Self.ShardSize = shardSize;
 			return this;
 		}
 
 		public SignificantTermsAggregationDescriptor<T> MinimumDocumentCount(int minimumDocumentCount)
 		{
-			Self._MinimumDocumentCount = minimumDocumentCount;
+			Self.MinimumDocumentCount = minimumDocumentCount;
 			return this;
 		}
 
 		public SignificantTermsAggregationDescriptor<T> ExecutionHint(TermsAggregationExecutionHint executionHint)
 		{
-			Self._ExecutionHint = executionHint;
+			Self.ExecutionHint = executionHint;
 			return this;
 		}
 
 		public SignificantTermsAggregationDescriptor<T> Include(string includePattern, string regexFlags = null)
 		{
-			Self._Include = new Dictionary<string, string> { {"pattern", includePattern}};
+			Self.Include = new Dictionary<string, string> { {"pattern", includePattern}};
 			if (!regexFlags.IsNullOrEmpty())
-				Self._Include.Add("pattern", regexFlags);
+				Self.Include.Add("pattern", regexFlags);
 			return this;
 		}
 
 		public SignificantTermsAggregationDescriptor<T> Exclude(string excludePattern, string regexFlags = null)
 		{
-			Self._Exclude = new Dictionary<string, string> { {"pattern", excludePattern}};
+			Self.Exclude = new Dictionary<string, string> { {"pattern", excludePattern}};
 			if (!regexFlags.IsNullOrEmpty())
-				Self._Exclude.Add("pattern", regexFlags);
+				Self.Exclude.Add("pattern", regexFlags);
 			return this;
 		}
 	}

src/Nest/DSL/Bulk/BulkCreateDescriptor.cs

@@ -39,9 +39,9 @@ public class BulkCreateDescriptor<T> : BulkOperationDescriptorBase, IBulkCreateO
 	{
 		private IBulkCreateOperation<T> Self { get { return this; } } 
 
-		protected override string _Operation { get { return "create"; } }
-		protected override Type _ClrType { get { return typeof(T); } }
-		protected override object _GetBody()
+		protected override string BulkOperationType { get { return "create"; } }
+		protected override Type BulkOperationClrType { get { return typeof(T); } }
+		protected override object GetBulkOperationBody()
 		{
 			return Self.Document;
 		}

src/Nest/DSL/Bulk/BulkDeleteDescriptor.cs

@@ -42,12 +42,12 @@ public class BulkDeleteDescriptor<T> : BulkOperationDescriptorBase, IBulkDeleteO
 	{
 		private IBulkDeleteOperation<T> Self { get { return this; } } 
 
-		protected override string _Operation { get { return "delete"; } }
-		protected override Type _ClrType { get { return typeof(T); } }
+		protected override string BulkOperationType { get { return "delete"; } }
+		protected override Type BulkOperationClrType { get { return typeof(T); } }
 
 		T IBulkDeleteOperation<T>.Document { get; set; }
 
-		protected override object _GetBody()
+		protected override object GetBulkOperationBody()
 		{
 			return null;
 		}

src/Nest/DSL/Bulk/BulkIndexDescriptor.cs

@@ -44,13 +44,13 @@ public class BulkIndexDescriptor<T> : BulkOperationDescriptorBase, IIndexOperati
 	{
 		private IIndexOperation<T> Self { get { return this; } } 
 
-		protected override string _Operation { get { return "index"; } }
-		protected override Type _ClrType { get { return typeof(T); } }
+		protected override string BulkOperationType { get { return "index"; } }
+		protected override Type BulkOperationClrType { get { return typeof(T); } }
 
 		string IIndexOperation<T>.Percolate { get; set; }
 		T IIndexOperation<T>.Document { get; set; }
 
-		protected override object _GetBody()
+		protected override object GetBulkOperationBody()
 		{
 			return Self.Document;
 		}

src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs

@@ -76,8 +76,8 @@ public class BulkUpdateDescriptor<TDocument, TPartialUpdate>
 	{
 		private IBulkUpdateOperation<TDocument, TPartialUpdate> Self { get { return this; } }
 
-		protected override string _Operation { get { return "update"; } }
-		protected override Type _ClrType { get { return typeof(TDocument); } }
+		protected override string BulkOperationType { get { return "update"; } }
+		protected override Type BulkOperationClrType { get { return typeof(TDocument); } }
 
 		TDocument IBulkUpdateOperation<TDocument, TPartialUpdate>.Document { get; set; }
 		TDocument IBulkUpdateOperation<TDocument, TPartialUpdate>.Upsert { get; set; }
@@ -87,7 +87,7 @@ public class BulkUpdateDescriptor<TDocument, TPartialUpdate>
 		string IBulkUpdateOperation<TDocument, TPartialUpdate>.Script { get; set; }
 		Dictionary<string, object> IBulkUpdateOperation<TDocument, TPartialUpdate>.Params { get; set; }
 
-		protected override object _GetBody()
+		protected override object GetBulkOperationBody()
 		{
 			return new BulkUpdateBody<TDocument, TPartialUpdate>
 			{

src/Nest/DSL/Common/BasePathRequest.cs

@@ -8,11 +8,11 @@ public abstract class BasePathRequest<TParameters> : BaseRequest<TParameters>
 		where TParameters : IRequestParameters, new()
 	{
 
-		[JsonIgnore]
-		public IRequestConfiguration RequestConfiguration
-		{	
-			get { return base._requestConfiguration; }
-			set { base._requestConfiguration = value; }
-		}
+		//[JsonIgnore]
+		//public IRequestConfiguration RequestConfiguration
+		//{	
+		//	get { return base._requestConfiguration; }
+		//	set { base._requestConfiguration = value; }
+		//}
 	}
 }

src/Nest/DSL/Common/BaseRequest.cs

@@ -17,8 +17,8 @@ IRequestConfiguration IRequest<TParameters>.RequestConfiguration
 			set { _requestConfiguration = value; }
 		}
 
-		protected TParameters _requestParameters = new TParameters();
-		protected IRequestConfiguration _requestConfiguration;
+		private TParameters _requestParameters = new TParameters();
+		private IRequestConfiguration _requestConfiguration;
 
 		[JsonIgnore]
 		TParameters IRequest<TParameters>.RequestParameters  

src/Nest/DSL/Filter/FilterContainer.cs

@@ -10,11 +10,11 @@ public class FilterContainer : IFilterContainer, ICustomJson
 	{
 		private static readonly IEnumerable<FilterContainer> Empty = Enumerable.Empty<FilterContainer>();
 
-		string IFilterContainer._FilterName { get; set; }
+		string IFilterContainer.FilterName { get; set; }
 
-		string IFilterContainer._CacheKey { get; set; }
+		string IFilterContainer.CacheKey { get; set; }
 
-		bool? IFilterContainer._Cache { get; set; }
+		bool? IFilterContainer.Cache { get; set; }
 
 		string IFilterContainer.RawFilter { get; set; }
 

src/Nest/DSL/Filter/FilterDescriptor.cs

@@ -14,17 +14,17 @@ public class FilterDescriptor<T> : FilterContainer
 
 		public FilterDescriptor<T> Name(string name)
 		{
-			Self._FilterName = name;
+			Self.FilterName = name;
 			return this;
 		}
 		public FilterDescriptor<T> CacheKey(string cacheKey)
 		{
-			Self._CacheKey = cacheKey;
+			Self.CacheKey = cacheKey;
 			return this;
 		}
 		public FilterDescriptor<T> Cache(bool cache)
 		{
-			Self._Cache = cache;
+			Self.Cache = cache;
 			return this;
 		}
 
@@ -717,9 +717,9 @@ private FilterDescriptor<T> New(IFilter filter, Action<IFilterContainer> fillPro
 
 		private void ResetCache()
 		{
-			Self._Cache = null;
-			Self._CacheKey = null;
-			Self._FilterName = null;
+			Self.Cache = null;
+			Self.CacheKey = null;
+			Self.FilterName = null;
 		}
 
 		private void SetCacheAndName(IFilter filter)
@@ -728,12 +728,12 @@ private void SetCacheAndName(IFilter filter)
 			filter.IsStrict = self.IsStrict;
 			filter.IsVerbatim = self.IsVerbatim;
 
-			if (Self._Cache.HasValue)
-				filter.Cache = Self._Cache;
-			if (!string.IsNullOrWhiteSpace(Self._FilterName))
-				filter.FilterName = Self._FilterName;
-			if (!string.IsNullOrWhiteSpace(Self._CacheKey))
-				filter.CacheKey = Self._CacheKey;
+			if (Self.Cache.HasValue)
+				filter.Cache = Self.Cache;
+			if (!string.IsNullOrWhiteSpace(Self.FilterName))
+				filter.FilterName = Self.FilterName;
+			if (!string.IsNullOrWhiteSpace(Self.CacheKey))
+				filter.CacheKey = Self.CacheKey;
 		}