Fixed failing unit/integration tests due to CLSCompliant refactor work

Author: Mpdreamz

src/Nest/DSL/Paths/QueryPathDescriptor.cs

@@ -184,6 +184,7 @@ public TDescriptor Index<TAlternative>() where TAlternative : class
 		/// </summary>
 		public TDescriptor Index(Type index)
 		{
+			if (index == null) return (TDescriptor)this;
 			return this.Indices(index);
 		}
 
@@ -192,6 +193,7 @@ public TDescriptor Index(Type index)
 		/// </summary>
 		public TDescriptor Index(IndexNameMarker index)
 		{
+			if (index == null) return (TDescriptor)this;
 			return this.Indices(index);
 		}
 
@@ -200,6 +202,7 @@ public TDescriptor Index(IndexNameMarker index)
 		/// </summary>
 		public TDescriptor Index(string index)
 		{
+			if (index == null) return (TDescriptor)this;
 			return this.Indices(index);
 		}
 
@@ -262,6 +265,7 @@ public TDescriptor Types(params Type[] types)
 		/// </summary>
 		public TDescriptor Type(TypeNameMarker type)
 		{
+			if (type == null) return (TDescriptor)this;
 			return this.Types(type);
 		}
 
@@ -271,6 +275,7 @@ public TDescriptor Type(TypeNameMarker type)
 		/// </summary>
 		public TDescriptor Type(string type)
 		{
+			if (type == null) return (TDescriptor)this;
 			return this.Types(type);
 		}
 
@@ -280,6 +285,7 @@ public TDescriptor Type(string type)
 		/// </summary>
 		public TDescriptor Type(Type type)
 		{
+			if (type == null) return (TDescriptor)this;
 			return this.Types(type);
 		}
 

src/Nest/ExposedInternals/NestSerializer.cs

@@ -125,8 +125,6 @@ public virtual Task<T> DeserializeAsync<T>(Stream stream)
 
 		internal JsonSerializerSettings CreateSettings(JsonConverter piggyBackJsonConverter = null)
 		{
-			if (piggyBackJsonConverter == null)
-				return this._serializationSettings;
 
 			var piggyBackState = new JsonConverterPiggyBackState { ActualJsonConverter = piggyBackJsonConverter };
 			var settings = new JsonSerializerSettings()

src/Nest/Resolvers/ElasticContractResolver.cs

@@ -95,6 +95,8 @@ protected override IList<JsonProperty> CreateProperties(Type type, MemberSeriali
 			var lookup = defaultProperties.ToLookup(p => p.PropertyName);
 
 			defaultProperties = PropertiesOf<IQuery>(type, memberSerialization, defaultProperties, lookup);
+			defaultProperties = PropertiesOf<IAllFieldMapping>(type, memberSerialization, defaultProperties, lookup);
+			defaultProperties = PropertiesOf<IExternalFieldDeclaration>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IQueryContainer>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IRequest>(type, memberSerialization, defaultProperties, lookup);
 			defaultProperties = PropertiesOf<IFilter>(type, memberSerialization, defaultProperties, lookup, append: true);

src/Nest/Resolvers/IndexNameResolver.cs

@@ -26,6 +26,9 @@ public string GetIndexForType(Type type)
 			if (defaultIndices == null)
 				return this._connectionSettings.DefaultIndex;
 
+			if (type == null)
+				return this._connectionSettings.DefaultIndex;
+
 			string value;
 			if (defaultIndices.TryGetValue(type, out value) && !string.IsNullOrWhiteSpace(value))
 				return value;
@@ -35,6 +38,8 @@ public string GetIndexForType(Type type)
 
 		internal string GetIndexForType(IndexNameMarker i)
 		{
+			if (i == null) return this.GetIndexForType((Type)null);
+
 			return i.Name ?? this.GetIndexForType(i.Type);
 		}
 	}

src/Nest/Resolvers/TypeNameResolver.cs

@@ -40,6 +40,8 @@ public string GetTypeNameFor(Type type)
 
 		internal string GetTypeNameFor(TypeNameMarker t)
 		{
+			if (t == null) return null;
+
 			return t.Name ?? this.GetTypeNameFor(t.Type);
 		}
 	}

src/Tests/Nest.Tests.Integration/ElasticsearchConfiguration.cs

@@ -44,7 +44,7 @@ public static ConnectionSettings Settings(int? port = null, Uri hostOverride = n
 				.ExposeRawResponse();
 		}
 
-		public static readonly Lazy<ElasticClient> Client = new Lazy<ElasticClient>(()=> new ElasticClient(Settings().EnableCompressedResponses()));
+		public static readonly Lazy<ElasticClient> Client = new Lazy<ElasticClient>(()=> new ElasticClient(Settings()));
 		public static readonly Lazy<ElasticClient> ClientNoRawResponse = new Lazy<ElasticClient>(()=> new ElasticClient(Settings().ExposeRawResponse(false)));
 		public static readonly Lazy<ElasticClient> ClientThatThrows = new Lazy<ElasticClient>(()=> new ElasticClient(Settings().ThrowOnElasticsearchServerExceptions()));
 		public static readonly Lazy<ElasticClient> ThriftClient = new Lazy<ElasticClient>(()=> new ElasticClient(Settings(9500), new ThriftConnection(Settings(9500))));