Merge branch 'lukapor-master'

Author: russcam

src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs

@@ -34,6 +34,6 @@ public class DateRangeExpressionDescriptor
 		public DateRangeExpressionDescriptor To(DateMath to) => Assign(a => a.To = to);
 
 		string IDateRangeExpression.Key { get; set; }
-		public DateRangeExpressionDescriptor From(string key) => Assign(a => a.Key = key);
+		public DateRangeExpressionDescriptor Key(string key) => Assign(a => a.Key = key);
 	}
 }

src/Nest/CommonAbstractions/Infer/Indices/Indices.cs

@@ -57,7 +57,8 @@ string IUrlParameter.GetString(IConnectionConfigurationValues settings)
 					var nestSettings = settings as IConnectionSettingsValues;
 					if (nestSettings == null)
 						throw new Exception("Tried to pass field name on querysting but it could not be resolved because no nest settings are available");
-					var infer = new Inferrer(nestSettings);
+
+					var infer = nestSettings.Inferrer;
 					var indices = many.Indices.Select(i => infer.IndexName(i)).Distinct();
 					return string.Join(",", indices);
 				}
@@ -81,7 +82,7 @@ public override int GetHashCode()
 		{
 			return this.Match(
 				all => "_all".GetHashCode(),
-				many => string.Concat(many.Indices).GetHashCode()
+				many => string.Concat(many.Indices.OrderBy(i => i.ToString())).GetHashCode()
 			);
 		}
 	}

src/Nest/Mapping/TypeMapping.cs

@@ -173,8 +173,11 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
 		/// <inheritdoc/>
 		public TypeMappingDescriptor<T> SizeField(Func<SizeFieldDescriptor, SizeFieldDescriptor> sizeFieldSelector) => Assign(a => a.SizeField = sizeFieldSelector?.Invoke(new SizeFieldDescriptor()));
 
-		/// <inheritdoc/>
-		public TypeMappingDescriptor<T> DisableSizeField(bool disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
+    /// <inheritdoc/>
+    public TypeMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, SourceFieldDescriptor> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
+
+    /// <inheritdoc/>
+    public TypeMappingDescriptor<T> DisableSizeField(bool disabled = true) => Assign(a => a.SizeField = new SizeField { Enabled = !disabled });
 
 		/// <inheritdoc/>
 		public TypeMappingDescriptor<T> DisableIndexField(bool disabled = true) => Assign(a => a.IndexField = new IndexField { Enabled = !disabled });

src/Nest/Search/MultiSearch/MultiSearchJsonConverter.cs

@@ -22,11 +22,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 			foreach (var operation in request.Operations.Values)
 			{
-				var indices = (request.Index != null && !request.Index.Equals(operation.Index))
+				var indices = request.Index == null || !request.Index.Equals(operation.Index)
 					? operation.Index
 					: null;
 
-				var types = (request.Type != null && !request.Type.Equals(operation.Type))
+				var types = request.Type == null || !request.Type.Equals(operation.Type)
 					? operation.Type
 					: null;