Merge branch 'fix/todo-sweap'

Author: russcam

build/scripts/Targets.fsx

@@ -42,8 +42,6 @@ Target "Benchmark" <| fun _ -> Benchmarker.Run()
 
 Target "Documentation" <| fun _ -> Documentation.Generate()
 
-Target "QuickCompile"  <| fun _ -> Build.QuickCompile()
-
 Target "Version" <| fun _ -> 
     Versioning.PatchAssemblyInfos()
     Versioning.PatchProjectJsons()

src/Elasticsearch.Net/Transport/Transport.cs

@@ -8,11 +8,11 @@ namespace Elasticsearch.Net
 	public class Transport<TConnectionSettings> : ITransport<TConnectionSettings>
 		where TConnectionSettings : IConnectionConfigurationValues
 	{
-		//TODO should all of these be public?
 		public TConnectionSettings Settings { get; }
-		public IDateTimeProvider DateTimeProvider { get; }
-		public IMemoryStreamFactory MemoryStreamFactory { get; }
-		public IRequestPipelineFactory PipelineProvider { get; }
+
+		private IDateTimeProvider DateTimeProvider { get; }
+		private IMemoryStreamFactory MemoryStreamFactory { get; }
+		private IRequestPipelineFactory PipelineProvider { get; }
 
 		/// <summary>
 		/// Transport coordinates the client requests over the connection pool nodes and is in charge of falling over on different nodes
@@ -43,7 +43,7 @@ IMemoryStreamFactory memoryStreamFactory
 
 			this.Settings = configurationValues;
 			this.PipelineProvider = pipelineProvider ?? new RequestPipelineFactory();
-			this.DateTimeProvider = dateTimeProvider ?? Net.DateTimeProvider.Default;
+			this.DateTimeProvider = dateTimeProvider ?? Elasticsearch.Net.DateTimeProvider.Default;
 			this.MemoryStreamFactory = memoryStreamFactory ?? new MemoryStreamFactory();
 		}
 
@@ -93,11 +93,9 @@ public ElasticsearchResponse<TReturn> Request<TReturn>(HttpMethod method, string
 							AuditTrail = pipeline?.AuditTrail
 						};
 					}
-					if (response != null && response.SuccessOrKnownError)
-					{
-						pipeline.MarkAlive(node);
-						break;
-					}
+					if (response == null || !response.SuccessOrKnownError) continue;
+					pipeline.MarkAlive(node);
+					break;
 				}
 				if (response == null || !response.Success)
 					pipeline.BadResponse(ref response, requestData, seenExceptions);
@@ -154,11 +152,9 @@ public async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(HttpMeth
 							AuditTrail = pipeline.AuditTrail
 						};
 					}
-					if (response != null && response.SuccessOrKnownError)
-					{
-						pipeline.MarkAlive(node);
-						break;
-					}
+					if (response == null || !response.SuccessOrKnownError) continue;
+					pipeline.MarkAlive(node);
+					break;
 				}
 				if (response == null || !response.Success)
 					pipeline.BadResponse(ref response, requestData, seenExceptions);

src/Nest/Aggregations/Bucket/Filters/NamedFiltersContainer.cs

@@ -5,7 +5,6 @@
 
 namespace Nest
 {
-	//TODO dict of string QUeryContainer?
 	[JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter<NamedFiltersContainer, string, IQueryContainer>))]
 	public interface INamedFiltersContainer : IIsADictionary<string, IQueryContainer>
 	{

src/Nest/Cluster/ClusterReroute/ClusterRerouteResponse.cs

@@ -14,9 +14,7 @@ public interface IClusterRerouteResponse : IResponse
 
 	public class ClusterRerouteResponse : ResponseBase, IClusterRerouteResponse
 	{
-		//TODO why is this not on the interface?
-		public int Version { get; internal set; }
 		public ClusterRerouteState State { get; internal set; }
-		public IReadOnlyCollection<ClusterRerouteExplanation> Explanations { get; } = EmptyReadOnly<ClusterRerouteExplanation>.Collection;
+		public IReadOnlyCollection<ClusterRerouteExplanation> Explanations { get; internal set; } = EmptyReadOnly<ClusterRerouteExplanation>.Collection;
 	}
 }

src/Nest/CommonAbstractions/Infer/Inferrer.cs

@@ -17,10 +17,9 @@ public class Inferrer
 		private TypeNameResolver TypeNameResolver { get; }
 		private FieldResolver FieldResolver { get; }
 
-		// TODO: Find some better place for this
-		internal ConcurrentDictionary<Type, JsonContract> Contracts { get; set; }
-		internal ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>> CreateMultiHitDelegates { get; set; }
-		internal ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>> CreateSearchResponseDelegates { get; set; }
+		internal ConcurrentDictionary<Type, JsonContract> Contracts { get; }
+		internal ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>> CreateMultiHitDelegates { get; }
+		internal ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>> CreateSearchResponseDelegates { get; }
 
 		public Inferrer(IConnectionSettingsValues connectionSettings)
 		{
@@ -30,6 +29,7 @@ public Inferrer(IConnectionSettingsValues connectionSettings)
 			this.IndexNameResolver = new IndexNameResolver(connectionSettings);
 			this.TypeNameResolver = new TypeNameResolver(connectionSettings);
 			this.FieldResolver = new FieldResolver(connectionSettings);
+
 			this.Contracts = new ConcurrentDictionary<Type, JsonContract>();
 			this.CreateMultiHitDelegates = new ConcurrentDictionary<Type, Action<MultiGetHitJsonConverter.MultiHitTuple, JsonSerializer, ICollection<IMultiGetHit<object>>>>();
 			this.CreateSearchResponseDelegates = new ConcurrentDictionary<Type, Action<MultiSearchResponseJsonConverter.SearchHitTuple, JsonSerializer, IDictionary<string, object>>>();

src/Nest/CommonAbstractions/SerializationBehavior/GenericJsonConverters/KeyValueJsonConverter.cs

@@ -31,8 +31,6 @@ internal class KeyValueConversion
 		public JsonProperty ValueProperty { get; set; }
 	}
 
-
-	//TODO this serializer feels to generalized since it relies on reflection and caching in KnownTypes :/
 	internal class KeyValueJsonConverter<TContainer, TValue> : JsonConverter
 		where TContainer : class, new()
 	{

src/Nest/CommonAbstractions/SerializationBehavior/JsonNetSerializer.cs

@@ -26,7 +26,7 @@ public class JsonNetSerializer : IElasticsearchSerializer
 		/// <summary>
 		/// Resolves JsonContracts for types
 		/// </summary>
-		protected ElasticContractResolver ContractResolver { get; }
+		private ElasticContractResolver ContractResolver { get; }
 
 		//TODO this internal smells
 		internal JsonSerializer Serializer => _defaultSerializer;

src/Nest/Document/Single/Delete/ElasticClient-Delete.cs

@@ -5,17 +5,6 @@
 
 namespace Nest
 {
-	//TODO I Deleted DeleteExtensions, when we introduced Document as a parameter folks can do
-
-	//.Delete<T>(id)
-	//.Delete(Document.Id<T>(2))
-	//.Delete<T>(T object)
-	//.Delete(Document.Infer<T>(2))
-
-
-	//Delete(Document.Index("a").Type("x").Id("1"), s=>s)
-	//Delete(Document.Infer(doc), s=>s)
-	//Delete(Document.Index<T>().Type<TOptional>().Id(2), s=>s)
 	public partial interface IElasticClient
 	{
 		/// <summary>

src/Nest/Document/Single/Update/UpdateRequest.cs

@@ -5,7 +5,6 @@
 
 namespace Nest
 {
-	//TODO we used to to a complex infer on Id, if its empty first try on Doc otherwise on Upsert doc, is this still valid?
 	public partial interface IUpdateRequest<TDocument, TPartialDocument>
 		where TDocument : class
 		where TPartialDocument : class

src/Nest/Indices/MappingManagement/GetFieldMapping/GetFieldMappingRequest.cs

@@ -4,8 +4,6 @@ public partial interface IGetFieldMappingRequest { }
 
 	public partial class GetFieldMappingRequest { }
 
-	//TODO Removed typed request validate this is still valid
-
 	[DescriptorFor("IndicesGetFieldMapping")]
 	public partial class GetFieldMappingDescriptor<T> where T : class { }
 }