removed double initialization of moving parts in client and transport, transport is in charge.

Author: Mpdreamz

src/Elasticsearch.Net/Connection/ITransport.cs

@@ -1,15 +1,24 @@
 using System.Collections.Specialized;
 using System.Threading.Tasks;
+using Elasticsearch.Net.Serialization;
 
 namespace Elasticsearch.Net.Connection
 {
 	public interface ITransport
 	{
+		IConnectionConfigurationValues Settings { get; }
+		IElasticsearchSerializer Serializer { get; }
+		
 		ElasticsearchResponse DoRequest(string method, string path, object data = null, NameValueCollection queryString = null, int retried = 0, int? seed = null);
 
 		Task<ElasticsearchResponse> DoRequestAsync(
 			string method, 
 			string path, 
 			object data = null, NameValueCollection queryString = null, int retried = 0, int? seed = null);
 	}
+
+	public interface ITransportValues
+	{
+		IElasticsearchSerializer Serializer { get; }
+	}
 }

src/Elasticsearch.Net/Connection/Transport.cs

@@ -12,25 +12,30 @@ namespace Elasticsearch.Net.Connection
 {
 	public class Transport : ITransport
 	{
-		private readonly IConnectionConfigurationValues _configurationValues;
-		private readonly IConnection _connection;
-		private readonly IElasticsearchSerializer _serializer;
+		protected internal readonly IConnectionConfigurationValues _configurationValues;
+		protected internal readonly IConnection _connection;
+		protected internal readonly IElasticsearchSerializer _serializer;
+
 		private readonly IConnectionPool _connectionPool;
 		private IDateTimeProvider _dateTimeProvider;
 		private DateTime? _lastSniff = null;
 
+		public IConnectionConfigurationValues Settings { get { return _configurationValues; } }
+		public IElasticsearchSerializer Serializer { get { return _serializer; } }
+
 		public Transport(
 			IConnectionConfigurationValues configurationValues,
 			IConnection connection, 
 			IElasticsearchSerializer serializer,
 			IDateTimeProvider dateTimeProvider = null
 			)
 		{
-			_dateTimeProvider = dateTimeProvider;
-			this._connection = connection;
 			this._configurationValues = configurationValues;
+			this._connection = connection?? new HttpConnection(configurationValues);
 			this._serializer = serializer ?? new ElasticsearchDefaultSerializer();
 			this._connectionPool = this._configurationValues.ConnectionPool;
+
+			//TODO: take the datetimeprovider from the connection pool?
 			this._dateTimeProvider = dateTimeProvider ?? new DateTimeProvider();
 
 			if (this._configurationValues.SniffsOnStartup)
@@ -62,6 +67,7 @@ private int GetMaximumRetries()
 			return this._configurationValues.MaxRetries.GetValueOrDefault(this._connectionPool.MaxRetries);
 		}
 
+
 		public ElasticsearchResponse DoRequest(
 			string method,
 			string path,

src/Elasticsearch.Net/ElasticsearchClient.cs

@@ -12,9 +12,9 @@ namespace Elasticsearch.Net
 {
 	public partial class ElasticsearchClient : IElasticsearchClient
 	{
-		public IConnection Connection { get; protected set; }
-		public IConnectionConfigurationValues Settings { get; protected set; }
-		public IElasticsearchSerializer Serializer { get; protected set; }
+		public IConnectionConfigurationValues Settings { get { return this.Transport.Settings; } }
+		public IElasticsearchSerializer Serializer { get { return this.Transport.Serializer; } }
+		
 		protected IStringifier Stringifier { get; set; }
 		protected ITransport Transport { get; set; }
 
@@ -29,12 +29,11 @@ public ElasticsearchClient(
 			if (settings == null)
 				throw new ArgumentNullException("settings");
 
-			this.Settings = settings;
-			this.Connection = connection ?? new HttpConnection(settings);
-			this.Serializer = serializer ?? new ElasticsearchDefaultSerializer();
-			((IConnectionConfigurationValues) this.Settings).Serializer = this.Serializer;
-			this.Transport = transport ?? new Transport(settings, this.Connection, this.Serializer);
+			this.Transport = transport ?? new Transport(settings, connection, serializer);
 			this.Stringifier = stringifier ?? new Stringifier();
+			
+			//neccessary to pass the serializer to ElasticsearchResponse
+			this.Settings.Serializer = this.Transport.Serializer;
 		}
 
 		protected NameValueCollection ToNameValueCollection<TQueryString>(FluentQueryString<TQueryString> qs)

src/Elasticsearch.Net/IElasticsearchClient.Generated.cs

@@ -21,7 +21,6 @@ namespace Elasticsearch.Net
 	///</summary>
 	public interface IElasticsearchClient
 	{	
-		IConnection Connection { get; }
 		IConnectionConfigurationValues Settings { get; }
 		IElasticsearchSerializer Serializer { get; }