Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Author: Mpdreamz

src/Elasticsearch.Net/Connection/Configuration/ConnectionConfiguration.cs

@@ -106,6 +106,9 @@ public class ConnectionConfiguration<T> : IConnectionConfigurationValues, IHideO
 		private TimeSpan? _sniffLifeSpan;
 		TimeSpan? IConnectionConfigurationValues.SniffInformationLifeSpan { get{ return _sniffLifeSpan; } }
 
+		private bool _compressionEnabled;
+		bool IConnectionConfigurationValues.EnableCompressedResponses { get{ return _compressionEnabled; } }
+
 		private bool _traceEnabled;
 		bool IConnectionConfigurationValues.TraceEnabled { get{ return _traceEnabled; } }
 
@@ -159,6 +162,16 @@ public T SniffLifeSpan(TimeSpan sniffTimeSpan)
 			return (T)this;
 		}
 
+		/// <summary>
+		/// Enable compressed responses from elasticsearch (NOTE that that nodes need to be configured to allow this)
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-http.html
+		/// </summary>
+		public T EnableCompressedResponses(bool enabled = true)
+		{
+			this._compressionEnabled = enabled;
+			return (T) this;
+		}
+
 		/// <summary>
 		/// Enable Trace signals to the IConnection that it should put debug information on the Trace.
 		/// </summary>

src/Elasticsearch.Net/Connection/Configuration/IConnectionConfiguration.cs

@@ -13,6 +13,12 @@ public interface IConnectionConfiguration<out T> : IHideObjectMembers
 		where T : IConnectionConfiguration<T>
 	{
 
+		/// <summary>
+		/// Enable compressed responses from elasticsearch (NOTE that that nodes need to be configured to allow this)
+		/// http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/modules-http.html
+		/// </summary>
+		T EnableCompressedResponses(bool enabled = true);
+		
 
 		/// <summary>
 		/// Enable Trace signals to the IConnection that it should put debug information on the Trace.

src/Elasticsearch.Net/Connection/Configuration/IConnectionConfigurationValues.cs

@@ -16,6 +16,7 @@ public interface IConnectionConfigurationValues
 		int? MaxDeadTimeout { get; }
 		int? MaxRetries { get; }
 		bool DisablePings { get; }
+		bool EnableCompressedResponses { get; }
 
 		string ProxyAddress { get; }
 		string ProxyUsername { get; }

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Net;
 using System.Runtime.InteropServices;
@@ -170,9 +171,13 @@ protected virtual HttpWebRequest CreateWebRequest(Uri uri, string method, byte[]
 			//var url = this._CreateUriString(path);
 
 			var myReq = (HttpWebRequest)WebRequest.Create(uri);
-
 			myReq.Accept = "application/json";
 			myReq.ContentType = "application/json";
+			if (this.ConnectionSettings.EnableCompressedResponses)
+			{
+				myReq.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+				myReq.Headers.Add("Accept-Encoding", "gzip,deflate");
+			}
 			if (requestSpecificConfig != null && !string.IsNullOrWhiteSpace(requestSpecificConfig.ContentType))
 			{
 				myReq.Accept = requestSpecificConfig.ContentType;

src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs

@@ -31,7 +31,7 @@ public static void SetRouteParameters<TParameters>(
 			ElasticsearchPathInfo<TParameters> pathInfo)
 			where TParameters : IRequestParameters, new()
 		{
-			var inferrer = new ElasticInferrer(settings);
+			var inferrer = settings.Inferrer;
 
 			pathInfo.Index = inferrer.IndexName(path.Index);
 			pathInfo.Type = inferrer.TypeName(path.Type);
@@ -45,7 +45,7 @@ public static void SetRouteParameters<TParameters, T>(
 			where TParameters : IRequestParameters, new()
 			where T : class
 		{
-			var inferrer = new ElasticInferrer(settings);
+			var inferrer = settings.Inferrer;
 
 			var index = path.Index != null ? inferrer.IndexName(path.Index) : inferrer.IndexName<T>();
 			var type = path.Type != null ? inferrer.TypeName(path.Type) : inferrer.TypeName<T>();

src/Nest/DSL/Paths/FixedIndexTypePathDescriptor.cs

@@ -21,7 +21,7 @@ public static void SetRouteParameters<TParameters>(
 			ElasticsearchPathInfo<TParameters> pathInfo)
 			where TParameters : IRequestParameters, new()
 		{	
-			var inferrer = new ElasticInferrer(settings);
+			var inferrer = settings.Inferrer;
 			var index = inferrer.IndexName(path.Index);
 			var type = inferrer.TypeName(path.Type);
 

src/Nest/DSL/Visitor/DslPrettyPrintVisitor.cs

@@ -25,7 +25,7 @@ public string PrettyPrint
 		public DslPrettyPrintVisitor(IConnectionSettingsValues settings)
 		{
 			this._sb = new StringBuilder();
-			this._infer = new ElasticInferrer(settings);
+			this._infer = settings.Inferrer;
 		}
 
 		public virtual int Depth { get; set; }

src/Nest/Domain/Connection/ConnectionSettings.cs

@@ -64,6 +64,9 @@ string IConnectionSettingsValues.DefaultIndex
 			}
 		}
 
+		private ElasticInferrer _inferrer;
+		ElasticInferrer IConnectionSettingsValues.Inferrer { get { return _inferrer; } }
+
 		private Func<Type, string> _defaultTypeNameInferrer;
 		Func<Type, string> IConnectionSettingsValues.DefaultTypeNameInferrer { get { return _defaultTypeNameInferrer; } }
 
@@ -97,6 +100,7 @@ public ConnectionSettings(IConnectionPool connectionPool, string defaultIndex) :
 
 			this._modifyJsonSerializerSettings = (j) => { };
 			this._contractConverters = Enumerable.Empty<Func<Type, JsonConverter>>().ToList().AsReadOnly();
+			this._inferrer = new ElasticInferrer(this);
 		}
 		public ConnectionSettings(Uri uri, string defaultIndex) 
 			: this(new SingleNodeConnectionPool(uri ?? new Uri("http://localhost:9200")), defaultIndex)

src/Nest/Domain/Connection/IConnectionSettingsValues.cs

@@ -7,6 +7,7 @@ namespace Nest
 {
 	public interface IConnectionSettingsValues : IConnectionConfigurationValues
 	{
+		ElasticInferrer Inferrer { get; }
 		FluentDictionary<Type, string> DefaultIndices { get; }
 		FluentDictionary<Type, string> DefaultTypeNames { get; }
 		string DefaultIndex { get; }

src/Nest/Domain/Paths/FieldSelection.cs

@@ -30,7 +30,7 @@ public class FieldSelection<T> : IFieldSelection<T>
 		private ElasticInferrer Infer { get; set; }
 		public FieldSelection(IConnectionSettingsValues settings, IDictionary<string, object> valuesDictionary = null)
 		{
-			this.Infer = new ElasticInferrer(settings);
+			this.Infer = settings.Inferrer;
 			((IFieldSelection<T>)this).FieldValuesDictionary = valuesDictionary;
 		}