Merge tag '1.1.2'

gmarz · gmarz · commit 454784c898ef · 2014-10-06T16:31:08.000-04:00
1.1.2
diff --git a/build/Elasticsearch.Net.Connection.HttpClient.nuspec b/build/Elasticsearch.Net.Connection.HttpClient.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.Connection.HttpClient</id>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <title>Elasticsearch.Net.Connection.HttpClient - IConnection implementation that uses Http</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An IConnection implementation that uses System.Net.Http.HttpClient to talk with elasticsearch</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.1"/>
+      <dependency id="Elasticsearch.Net" version="1.1.2"/>
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
   </metadata>
diff --git a/build/Elasticsearch.Net.Connection.Thrift.nuspec b/build/Elasticsearch.Net.Connection.Thrift.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.Connection.Thrift</id>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <title>Elasticsearch.Net.Connection.Thrift - Thrift support for Elasticsearch.Net</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,8 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>An IConnection implementation that utilizes Apache Thrift to talk with elasticsearch</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.1"/>
-      <dependency id="NetReflector" />
+      <dependency id="Elasticsearch.Net" version="1.1.2"/>
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
   </metadata>
diff --git a/build/Elasticsearch.Net.JsonNET.nuspec b/build/Elasticsearch.Net.JsonNET.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net.JsonNET</id>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <title>Elasticsearch.Net.JsonNET - Json.NET serializer for the low level elasticsearch client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>This package is only useful if you use the low level client ONLY and do not use NEST but would like to use JSON.NET as your serializer</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.1"/>
+      <dependency id="Elasticsearch.Net" version="1.1.2"/>
     </dependencies>
     <tags>elasticsearch elastic search lucene thrift nest</tags>
   </metadata>
diff --git a/build/Elasticsearch.Net.nuspec b/build/Elasticsearch.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Elasticsearch.Net</id>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <title>Elasticsearch.Net - official low level elasticsearch client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
diff --git a/build/NEST.nuspec b/build/NEST.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NEST</id>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <title>NEST - Elasticsearch Client</title>
     <authors>Elasticsearch Inc. and contributors</authors>
     <owners>Elasticsearch Inc.</owners>
@@ -13,7 +13,7 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Elasticsearch client, strongly typed interface to Elasticsearch. Fluent request builder, mapped responses and powerful query dsl. Uses and exposes Elasticsearch.Net</description>
     <dependencies>
-      <dependency id="Elasticsearch.Net" version="1.1.1"/>
+      <dependency id="Elasticsearch.Net" version="1.1.2"/>
       <dependency id="Newtonsoft.Json" version="6.0.1" />
     </dependencies>
     <tags>elasticsearch elastic search lucene nest</tags>
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs b/src/CodeGeneration/CodeGeneration.YamlTestsRunner/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs b/src/Connections/Elasticsearch.Net.Connection.HttpClient/HttpClientConnection.cs
@@ -38,9 +38,6 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH
 
 			var innerHandler = handler ?? new WebRequestHandler();
 
-			if (settings.EnableCompressedResponses)
-				innerHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-
 			if (innerHandler.SupportsProxy && !string.IsNullOrWhiteSpace(_settings.ProxyAddress))
 			{
 				innerHandler.Proxy = new WebProxy(_settings.ProxyAddress)
@@ -56,6 +53,12 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH
 			{
 				Timeout = TimeSpan.FromMilliseconds(_settings.Timeout)
 			};
+			if (settings.EnableCompressedResponses && innerHandler.SupportsAutomaticDecompression)
+			{
+				innerHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+				Client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip"));
+				Client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("deflate"));
+			}
 
 		}
 
@@ -126,7 +129,6 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
 				else if (!string.IsNullOrWhiteSpace(DefaultContentType))
 					request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType));
 
-
 				if (!string.IsNullOrEmpty(uri.UserInfo))
 				{
 					request.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes(uri.UserInfo)));
@@ -141,7 +143,7 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur
 
 				var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
 
-				if (method == HttpMethod.Head || response.Content == null || !response.Content.Headers.ContentLength.HasValue || response.Content.Headers.ContentLength.Value <= 0)
+				if (method == HttpMethod.Head || response.Content == null)
 				{
 					return ElasticsearchResponse<Stream>.Create(_settings, (int)response.StatusCode, method.ToString().ToLowerInvariant(), uri.ToString(), data);
 				}
diff --git a/src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs b/src/Connections/Elasticsearch.Net.Connection.HttpClient/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs b/src/Connections/Elasticsearch.Net.Connection.Thrift/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Elasticsearch.Net/Properties/AssemblyInfo.cs b/src/Elasticsearch.Net/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Nest/DSL/Query/QueryDescriptor.cs b/src/Nest/DSL/Query/QueryDescriptor.cs
@@ -57,6 +57,7 @@ private QueryDescriptor<T> New(IQuery query, Action<IQueryContainer> fillPropert
 
 			if (fillProperty != null)
 				fillProperty(q);
+
 			return q;
 		}
 
@@ -463,6 +464,14 @@ public QueryContainer Filtered(Action<FilteredQueryDescriptor<T>> selector)
 			var query = new FilteredQueryDescriptor<T>();
 			selector(query);
 
+			var filtered = query as IFilteredQuery;
+			
+			if (filtered.Query != null && filtered.Query.IsConditionless)
+				filtered.Query = null;
+			
+			if (filtered.Filter != null && filtered.Filter.IsConditionless)
+				filtered.Filter = null;
+
 			return this.New(query, q => q.Filtered = query);
 		}
 
diff --git a/src/Nest/DSL/SearchDescriptor.cs b/src/Nest/DSL/SearchDescriptor.cs
@@ -82,9 +82,11 @@ public interface ISearchRequest : IQueryPath<SearchRequestParameters>
 		string Preference { get; }
 		
 		string Routing { get; }
-		
+
 		SearchType? SearchType { get;  }
-		
+
+		bool? IgnoreUnavalable { get; }
+
 		Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set;}
 		
 		SearchRequestParameters QueryString { get; set; }
@@ -172,6 +174,12 @@ string ISearchRequest.Routing
 					: string.Join(",", routing);
 			}
 		}
+
+		bool? ISearchRequest.IgnoreUnavalable
+		{
+			get { return this.QueryString == null ? null : this.QueryString.GetQueryStringValue<bool?>("ignore_unavailable"); }
+		}
+
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 
 		public SearchRequestParameters QueryString { get; set; }
@@ -233,6 +241,12 @@ string ISearchRequest.Routing
 					: string.Join(",", routing);
 			}
 		}
+
+		bool? ISearchRequest.IgnoreUnavalable
+		{
+			get { return this.QueryString == null ? null : this.QueryString.GetQueryStringValue<bool?>("ignore_unavailable");  }
+		}
+
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 		public SearchRequestParameters QueryString { get; set; }
 	}
@@ -273,6 +287,11 @@ string ISearchRequest.Routing
 			}
 		}
 
+		bool? ISearchRequest.IgnoreUnavalable
+		{
+			get { return this.Request.RequestParameters.GetQueryStringValue<bool?>("ignore_unavailable"); }
+		}
+
 		Type ISearchRequest.ClrType { get { return typeof(T); } }
 
 		/// <summary>
diff --git a/src/Nest/ElasticClient-Analyze.cs b/src/Nest/ElasticClient-Analyze.cs
@@ -16,7 +16,6 @@ public IAnalyzeResponse Analyze(Func<AnalyzeDescriptor, AnalyzeDescriptor> analy
 					IRequest<AnalyzeRequestParameters> request = d;
 					var text = request.RequestParameters.GetQueryStringValue<string>("text");
 					request.RequestParameters.RemoveQueryString("text");
-					text.ThrowIfNullOrEmpty("No text specified to analyze");
 					return this.RawDispatch.IndicesAnalyzeDispatch<AnalyzeResponse>(p, text);
 				}
 			);
@@ -32,7 +31,6 @@ public IAnalyzeResponse Analyze(IAnalyzeRequest analyzeRequest)
 					IRequest<AnalyzeRequestParameters> request = d;
 					var text = request.RequestParameters.GetQueryStringValue<string>("text");
 					request.RequestParameters.RemoveQueryString("text");
-					text.ThrowIfNullOrEmpty("No text specified to analyze");
 					return this.RawDispatch.IndicesAnalyzeDispatch<AnalyzeResponse>(p, text);
 				}
 			);
@@ -48,7 +46,6 @@ public Task<IAnalyzeResponse> AnalyzeAsync(Func<AnalyzeDescriptor, AnalyzeDescri
 					IRequest<AnalyzeRequestParameters> request = d;
 					var text = request.RequestParameters.GetQueryStringValue<string>("text");
 					request.RequestParameters.RemoveQueryString("text");
-					text.ThrowIfNullOrEmpty("No text specified to analyze");
 					return this.RawDispatch.IndicesAnalyzeDispatchAsync<AnalyzeResponse>(p, text);
 				}
 			);
@@ -64,7 +61,6 @@ public Task<IAnalyzeResponse> AnalyzeAsync(IAnalyzeRequest analyzeRequest)
 					IRequest<AnalyzeRequestParameters> request = d;
 					var text = request.RequestParameters.GetQueryStringValue<string>("text");
 					request.RequestParameters.RemoveQueryString("text");
-					text.ThrowIfNullOrEmpty("No text specified to analyze");
 					return this.RawDispatch.IndicesAnalyzeDispatchAsync<AnalyzeResponse>(p, text);
 				}
 			);
diff --git a/src/Nest/ExposedInternals/NestSerializer.cs b/src/Nest/ExposedInternals/NestSerializer.cs
@@ -288,7 +288,8 @@ public string SerializeMultiSearch(IMultiSearchRequest multiSearchRequest)
 					type = path.Type,
 					search_type = this.GetSearchType(operation, multiSearchRequest),
 					preference = operation.Preference,
-					routing = operation.Routing
+					routing = operation.Routing,
+					ignore_unavailable = operation.IgnoreUnavalable
 				};
 				var opJson = this.Serialize(op, SerializationFormatting.None).Utf8String();
 
diff --git a/src/Nest/Properties/AssemblyInfo.cs b/src/Nest/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Profiling/Profiling.InMemoryConnection/Properties/AssemblyInfo.cs b/src/Profiling/Profiling.InMemoryConnection/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Profiling/Profiling.Indexing/Properties/AssemblyInfo.cs b/src/Profiling/Profiling.Indexing/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Serialization/Elasticsearch.Net.JsonNET/Properties/AssemblyInfo.cs b/src/Serialization/Elasticsearch.Net.JsonNET/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Elasticsearch.Net.Integration.Yaml/Properties/AssemblyInfo.cs b/src/Tests/Elasticsearch.Net.Integration.Yaml/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Elasticsearch.Net.Tests.Unit/Properties/AssemblyInfo.cs b/src/Tests/Elasticsearch.Net.Tests.Unit/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("1.0.0")]
-[assembly: AssemblyFileVersionAttribute("1.1.1")]
-[assembly: AssemblyInformationalVersionAttribute("1.1.1")]
+[assembly: AssemblyFileVersionAttribute("1.1.2")]
+[assembly: AssemblyInformationalVersionAttribute("1.1.2")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "1.0.0";
diff --git a/src/Tests/Nest.Tests.Integration/Core/Analyze/AnalyzeTests.cs b/src/Tests/Nest.Tests.Integration/Core/Analyze/AnalyzeTests.cs
@@ -0,0 +1,30 @@
+﻿using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+
+namespace Nest.Tests.Integration.Core.Analyze
+{
+	[TestFixture]
+	public class AnalyzeTests : IntegrationTests
+	{
+		[Test]
+		public void AnalyzeTest()
+		{
+			var request = new AnalyzeRequest("text to analyze");
+			var result = this.Client.Analyze(request);
+			result.IsValid.Should().BeTrue();
+		}
+
+		[Test]
+		public void AnalyzeEmptyStringDoesNotThrow()
+		{
+			var request = new AnalyzeRequest(string.Empty);
+			var result = this.Client.Analyze(request);
+			result.IsValid.Should().BeFalse();
+		}
+	}
+}
diff --git a/src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs b/src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs
@@ -58,6 +58,7 @@ public void MultipleComplexSearches()
 		{
 			var result = this.Client.MultiSearch(b => b
 				.Search<ElasticsearchProject>(s => s
+					.IgnoreUnavailable()
 					.Query(q=>q.Term(p=>p.Name, "NEST"))
 					.Filter(f => f.Term(p => p.Name, "NEST"))
 					.FacetTerm(tf=>tf.OnField(p=>p.Name).Global())
diff --git a/src/Tests/Nest.Tests.Integration/ElasticsearchConfiguration.cs b/src/Tests/Nest.Tests.Integration/ElasticsearchConfiguration.cs
diff --git a/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj b/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj
diff --git a/src/Tests/Nest.Tests.Integration/Properties/AssemblyInfo.cs b/src/Tests/Nest.Tests.Integration/Properties/AssemblyInfo.cs
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce953Tests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/Reproduce953Tests.cs
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/FilteredQueryTests.cs b/src/Tests/Nest.Tests.Integration/Search/Query/FilteredQueryTests.cs
diff --git a/src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs b/src/Tests/Nest.Tests.MockData/Properties/AssemblyInfo.cs
diff --git a/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchRespectsSearchTypePreferenceAndRouting.json b/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchRespectsSearchTypePreferenceAndRouting.json
diff --git a/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs b/src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs
diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj
diff --git a/src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs b/src/Tests/Nest.Tests.Unit/Properties/AssemblyInfo.cs
diff --git a/src/Tests/Nest.Tests.Unit/Search/Filter/Singles/TermsFilterJson.cs b/src/Tests/Nest.Tests.Unit/Search/Filter/Singles/TermsFilterJson.cs

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,6 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH`
`38`	`38`
`39`	`39`	`var innerHandler = handler ?? new WebRequestHandler();`
`40`	`40`
`41`		`- if (settings.EnableCompressedResponses)`
`42`		`- innerHandler.AutomaticDecompression = DecompressionMethods.GZip \| DecompressionMethods.Deflate;`
`43`		`-`
`44`	`41`	`if (innerHandler.SupportsProxy && !string.IsNullOrWhiteSpace(_settings.ProxyAddress))`
`45`	`42`	`{`
`46`	`43`	`innerHandler.Proxy = new WebProxy(_settings.ProxyAddress)`
`@@ -56,6 +53,12 @@ public HttpClientConnection(IConnectionConfigurationValues settings, HttpClientH`
`56`	`53`	`{`
`57`	`54`	`Timeout = TimeSpan.FromMilliseconds(_settings.Timeout)`
`58`	`55`	`};`
	`56`	`+ if (settings.EnableCompressedResponses && innerHandler.SupportsAutomaticDecompression)`
	`57`	`+ {`
	`58`	`+ innerHandler.AutomaticDecompression = DecompressionMethods.GZip \| DecompressionMethods.Deflate;`
	`59`	`+ Client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("gzip"));`
	`60`	`+ Client.DefaultRequestHeaders.AcceptEncoding.Add(new StringWithQualityHeaderValue("deflate"));`
	`61`	`+ }`
`59`	`62`
`60`	`63`	`}`
`61`	`64`
`@@ -126,7 +129,6 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur`
`126`	`129`	`else if (!string.IsNullOrWhiteSpace(DefaultContentType))`
`127`	`130`	`request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue(DefaultContentType));`
`128`	`131`
`129`		`-`
`130`	`132`	`if (!string.IsNullOrEmpty(uri.UserInfo))`
`131`	`133`	`{`
`132`	`134`	`request.Headers.Authorization = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes(uri.UserInfo)));`
`@@ -141,7 +143,7 @@ public async Task<ElasticsearchResponse<Stream>> DoRequest(HttpMethod method, Ur`
`141`	`143`
`142`	`144`	`var response = await Client.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);`
`143`	`145`
`144`		`- if (method == HttpMethod.Head \|\| response.Content == null \|\| !response.Content.Headers.ContentLength.HasValue \|\| response.Content.Headers.ContentLength.Value <= 0)`
	`146`	`+ if (method == HttpMethod.Head \|\| response.Content == null)`
`145`	`147`	`{`
`146`	`148`	`return ElasticsearchResponse<Stream>.Create(_settings, (int)response.StatusCode, method.ToString().ToLowerInvariant(), uri.ToString(), data);`
`147`	`149`	`}`