added explicit IDisposable where it made sense and documented the life time scopes of the various moving parts

Author: Mpdreamz

src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs

@@ -19,6 +19,7 @@ public class ConnectionConfiguration : ConnectionConfiguration<ConnectionConfigu
 		/// to elasticsearch
 		/// </summary>
 		/// <param name="uri">The root of the elasticsearch node we want to connect to. Defaults to http://localhost:9200</param>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
 		public ConnectionConfiguration(Uri uri = null)
 			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200")))
 		{ }
@@ -48,9 +49,6 @@ public ConnectionConfiguration(IConnectionPool connectionPool, IConnection conne
 			: base(connectionPool, connection, serializerFactory)
 		{ }
 
-		public void Dispose()
-		{
-		}
 	}
 
 	[Browsable(false)]
@@ -134,11 +132,10 @@ private static void DefaultApiCallHandler(IApiCallDetails status) { }
 		BasicAuthenticationCredentials _basicAuthCredentials;
 		BasicAuthenticationCredentials IConnectionConfigurationValues.BasicAuthenticationCredentials => _basicAuthCredentials;
 
-		protected IElasticsearchSerializer _serializer;
+		private readonly IElasticsearchSerializer _serializer;
 		IElasticsearchSerializer IConnectionConfigurationValues.Serializer => _serializer;
 
 		private readonly IConnectionPool _connectionPool;
-		private readonly Func<T, IElasticsearchSerializer> _serializerFactory;
 		IConnectionPool IConnectionConfigurationValues.ConnectionPool => _connectionPool;
 
 		private readonly IConnection _connection;
@@ -151,9 +148,9 @@ protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection co
 		{
 			this._connectionPool = connectionPool;
 			this._connection = connection ?? new HttpConnection();
-			this._serializerFactory = serializerFactory ?? (c=>this.DefaultSerializer((T)this));
+			serializerFactory = serializerFactory ?? (c=>this.DefaultSerializer((T)this));
 			// ReSharper disable once VirtualMemberCallInContructor
-			this._serializer = this._serializerFactory((T)this);
+			this._serializer = serializerFactory((T)this);
 
 			this._requestTimeout = ConnectionConfiguration.DefaultTimeout;
 			this._sniffOnConnectionFault = true;
@@ -313,9 +310,12 @@ public T BasicAuthentication(string userName, string password)
 		/// </summary>
 		public T EnableHttpPipelining(bool enabled = true) => Assign(a => a._enableHttpPipelining = enabled);
 
-		public void Dispose()
+		void IDisposable.Dispose() => this.DisposeManagedResources();
+
+		protected virtual void DisposeManagedResources()
 		{
 			this._connectionPool?.Dispose();
+			this._connection?.Dispose();
 		}
 	}
 }

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -194,5 +194,9 @@ private void HandleException<TReturn>(ResponseBuilder<TReturn> builder, WebExcep
 				builder.Stream = response.GetResponseStream();
 			}
 		}
+
+		void IDisposable.Dispose() => this.DisposeManagedResources();
+
+		protected virtual void DisposeManagedResources() { }
 	}
 }

src/Elasticsearch.Net/Connection/IConnection.cs

@@ -1,8 +1,9 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 
 namespace Elasticsearch.Net
 {
-	public interface IConnection
+	public interface IConnection : IDisposable
 	{
 		Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(RequestData requestData)
 			where TReturn : class;

src/Elasticsearch.Net/ConnectionPool/SingleNodeConnectionPool.cs

@@ -30,8 +30,8 @@ public SingleNodeConnectionPool(Uri uri, IDateTimeProvider dateTimeProvider = nu
 
 		public IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = null) => this.Nodes;
 
-		public void Dispose()
-		{
-		}
+		void IDisposable.Dispose() => this.DisposeManagedResources();
+
+		protected virtual void DisposeManagedResources() { }
 	}
 }

src/Elasticsearch.Net/ConnectionPool/SniffingConnectionPool.cs

@@ -73,10 +73,10 @@ public override IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = nu
 			}
 		}
 
-		public override void Dispose()
+		protected override void DisposeManagedResources()
 		{
 			this._readerWriter?.Dispose();
-			base.Dispose();
+			base.DisposeManagedResources();
 		}
 	}
 }

src/Elasticsearch.Net/ConnectionPool/StaticConnectionPool.cs

@@ -97,8 +97,8 @@ public virtual IEnumerable<Node> CreateView(Action<AuditEvent, Node> audit = nul
 			}
 		}
 
-		public virtual void Dispose()
-		{
-		}
+		void IDisposable.Dispose() => this.DisposeManagedResources();
+
+		protected virtual void DisposeManagedResources() { }
 	}
 }

src/Elasticsearch.Net/ElasticsearchClient.cs

@@ -16,9 +16,11 @@ public partial class ElasticsearchClient : IElasticsearchClient
 		protected ITransport<IConnectionConfigurationValues> Transport { get; set; }
 
 		/// <summary>Instantiate a new low level elasticsearch client to http://localhost:9200</summary>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
 		public ElasticsearchClient() : this(new Transport<IConnectionConfigurationValues>(new ConnectionConfiguration())) { }
 
 		/// <summary>Instantiate a new low level elasticsearch client using the specified settings</summary>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
 		public ElasticsearchClient(IConnectionConfigurationValues settings) : this(new Transport<IConnectionConfigurationValues>(settings ?? new ConnectionConfiguration())) { }
 
 		/// <summary>

src/Elasticsearch.Net/GlobalSuppressions.cs

@@ -1,8 +1,10 @@
+using System;
 using System.Threading.Tasks;
 
 namespace Elasticsearch.Net
 {
-	public interface ITransport<out TConnectionSettings> where TConnectionSettings : IConnectionConfigurationValues
+	public interface ITransport<out TConnectionSettings> : IDisposable
+		where TConnectionSettings : IConnectionConfigurationValues
 	{
 		TConnectionSettings Settings { get; }