Merge branch 'develop' into fix/aggs1.5

Author: Mpdreamz

docs/build/nest/core/multi-search.html

@@ -3,20 +3,20 @@
 <p>The multi search API allows to execute several search requests within the same API.</p>
 <h3 id="fluent-syntax">Fluent Syntax</h3>
 <pre><code>var result = client.MultiSearch(ms =&gt; ms
-    .Search&lt;ElasticsearchProject&gt;(&quot;esproj&quot;, s =&gt; s.MatchAll())
+    .Search&lt;ElasticsearchProject&gt;(&quot;projects&quot;, s =&gt; s.MatchAll())
     .Search&lt;Person&gt;(&quot;people&quot;, s =&gt; s.MatchAll())
 );
 </code></pre><h3 id="object-initializer-syntax">Object Initializer Syntax</h3>
 <pre><code>var request = new MultiSearchRequest
 {
     Operations = new Dictionary&lt;string, ISearchRequest&gt;
     {
-        { &quot;esproj&quot;, new SearchRequest 
+        { &quot;projects&quot;, new SearchRequest&lt;ElasticsearchProject&gt;
             { 
                 Query = new QueryContainer(new MatchAllQuery()) 
             } 
         },
-        { &quot;people&quot;, new SearchRequest 
+        { &quot;people&quot;, new SearchRequest&lt;Person&gt;
             { 
                 Query = new QueryContainer(new MatchAllQuery()) 
             } 
@@ -28,7 +28,7 @@ <h3 id="fluent-syntax">Fluent Syntax</h3>
 </code></pre><h2 id="handling-the-multi-search-response">Handling the Multi Search Response</h2>
 <p><code>MultiSearch</code> returns an <code>IMultiSearchResponse</code> object.  Each <code>SearchResponse&lt;T&gt;</code> can be retrieved using the corresponding name that was specified in the request.</p>
 <pre><code>// returns a SearchResponse&lt;ElasticsearchProject&gt;&gt;
-var projects = result.GetResponse&lt;ElasticsearchProject&gt;(&quot;esproj&quot;);
+var projects = result.GetResponse&lt;ElasticsearchProject&gt;(&quot;projects&quot;);
 
 // returns a SearchResponse&lt;Person&gt;&gt;
 var people = result.GetResponse&lt;Person&gt;(&quot;people&quot;);

docs/contents/nest/core/multi-search.markdown

@@ -13,7 +13,7 @@ The multi search API allows to execute several search requests within the same A
 ### Fluent Syntax
 
 	var result = client.MultiSearch(ms => ms
-		.Search<ElasticsearchProject>("esproj", s => s.MatchAll())
+		.Search<ElasticsearchProject>("projects", s => s.MatchAll())
 		.Search<Person>("people", s => s.MatchAll())
 	);
 
@@ -24,12 +24,12 @@ The multi search API allows to execute several search requests within the same A
 	{
 		Operations = new Dictionary<string, ISearchRequest>
 		{
-			{ "esproj", new SearchRequest 
+			{ "projects", new SearchRequest<ElasticsearchProject>
 				{ 
 					Query = new QueryContainer(new MatchAllQuery()) 
 				} 
 			},
-			{ "people", new SearchRequest 
+			{ "people", new SearchRequest<Person>
 				{ 
 					Query = new QueryContainer(new MatchAllQuery()) 
 				} 
@@ -44,7 +44,7 @@ The multi search API allows to execute several search requests within the same A
 `MultiSearch` returns an `IMultiSearchResponse` object.  Each `SearchResponse<T>` can be retrieved using the corresponding name that was specified in the request.
 
 	// returns a SearchResponse<ElasticsearchProject>>
-	var projects = result.GetResponse<ElasticsearchProject>("esproj");
+	var projects = result.GetResponse<ElasticsearchProject>("projects");
 
 	// returns a SearchResponse<Person>>
 	var people = result.GetResponse<Person>("people");

src/Nest/DSL/PutMappingDescriptor.cs

@@ -99,11 +99,11 @@ public PutMappingDescriptor<T> InitializeUsing(RootObjectMapping rootObjectMappi
 		}
 
 		/// <summary>
-		/// Convenience method to map from most of the object from the attributes/properties.
-		/// Later calls can override whatever is set is by this call. 
-		/// This helps mapping all the ints as ints, floats as floats etcetera withouth having to be overly verbose in your fluent mapping
+		/// Convenience method to map as much as it can based on ElasticType attributes set on the type.
+		/// <pre>This method also automatically sets up mappings for known values types (int, long, double, datetime, etcetera)</pre>
+		/// <pre>Class types default to object and Enums to int</pre>
+		/// <pre>Later calls can override whatever is set is by this call.</pre>
 		/// </summary>
-		/// <returns></returns>
 		public PutMappingDescriptor<T> MapFromAttributes(int maxRecursion = 0)
 		{
 			//TODO no longer needed when we have an IPutMappingRequest

src/Nest/Resolvers/Converters/MultiSearchConverter.cs

@@ -96,7 +96,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			{
 				var descriptor = m.Descriptor.Value;
 				var concreteTypeSelector = descriptor.TypeSelector;
-				var baseType = m.Descriptor.Value.ClrType;
+				var baseType = m.Descriptor.Value.ClrType ?? typeof(object);
 
 				var generic = MakeDelegateMethodInfo.MakeGenericMethod(baseType);
 

src/Nest/Resolvers/Writers/TypeMappingWriter.cs

@@ -15,6 +15,10 @@ public class TypeMappingWriter
 		private readonly Type _type;
 		private readonly IConnectionSettingsValues _connectionSettings;
 		private readonly NestSerializer _elasticSerializer;
+
+		private readonly static string _noFieldTypeMessage =
+			"Property {0} on type {1} has an ElasticProperty attribute but its FieldType (Type = ) can not be inferred and is not set explicitly while calling MapFromAttributes";
+
 		private ElasticInferrer Infer { get; set; }
 
 		private int MaxRecursion { get; set; }
@@ -136,7 +140,7 @@ internal void WriteProperties(JsonWriter jsonWriter)
 
 				var propertyName = this.Infer.PropertyName(p);
 				var type = GetElasticSearchType(att, p);
-				
+
 				if (type == null) //could not get type from attribute or infer from CLR type.
 					continue;
 
@@ -194,6 +198,11 @@ private string GetElasticSearchType(IElasticPropertyAttribute att, PropertyInfo
 			if (fieldType == null || fieldType == FieldType.None)
 			{
 				fieldType = this.GetFieldTypeFromType(p.PropertyType);
+				if (fieldType == null && att != null)
+				{
+					var message = _noFieldTypeMessage.F(p.Name, this._type.Name);
+					throw new DslException(message);
+				}
 			}
 
 			return this.GetElasticSearchTypeFromFieldType(fieldType);
@@ -234,8 +243,8 @@ private string GetElasticSearchTypeFromFieldType(FieldType? fieldType)
 					return "boolean";
 				case FieldType.Completion:
 					return "completion";
-        case FieldType.Nested:
-          return "nested";
+				case FieldType.Nested:
+					return "nested";
 				case FieldType.Object:
 					return "object";
 				default:
@@ -255,6 +264,9 @@ private string GetElasticSearchTypeFromFieldType(FieldType? fieldType)
 			if (propertyType == typeof(string))
 				return FieldType.String;
 
+			if (propertyType.IsEnum)
+				return FieldType.Integer;
+
 			if (propertyType.IsValueType)
 			{
 				switch (propertyType.Name)
@@ -284,7 +296,7 @@ private static Type GetUnderlyingType(Type type)
 			if (type.IsArray)
 				return type.GetElementType();
 
-            if (type.IsGenericType && type.GetGenericArguments().Length == 1 && (type.GetInterface("IEnumerable") != null || Nullable.GetUnderlyingType(type) != null))
+			if (type.IsGenericType && type.GetGenericArguments().Length == 1 && (type.GetInterface("IEnumerable") != null || Nullable.GetUnderlyingType(type) != null))
 				return type.GetGenericArguments()[0];
 
 			return type;

src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -179,6 +179,7 @@
     <Compile Include="Reproduce\Reproduce994Tests.cs" />
     <Compile Include="Reproduce\Reproduce986Tests.cs" />
     <Compile Include="Reproduce\Reproduce960Tests.cs" />
+    <Compile Include="Reproduce\Reproduce1279Tests.cs" />
     <Compile Include="Search\Filter\AndOrNotFilterTests.cs" />
     <Compile Include="Search\Filter\ScriptFilterTests.cs" />
     <Compile Include="Search\Filter\MissingExistsFilterTests.cs" />

src/Tests/Nest.Tests.Integration/Reproduce/Reproduce1279Tests.cs

@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Nest.Tests.MockData.Domain;
+using Newtonsoft.Json.Linq;
+
+namespace Nest.Tests.Integration.Reproduce
+{
+	[TestFixture]
+	public class Reproduce1279Tests : IntegrationTests
+	{
+		[Test]
+		public void MultiSearchNullArgumentException()
+		{
+			var request = new MultiSearchRequest
+			{
+				Operations = new Dictionary<string, ISearchRequest>
+				{
+					{ "test", new SearchRequest
+						{
+							Query = new QueryContainer(new MatchAllQuery()),
+							Types = new TypeNameMarker[] { typeof(Product), typeof(ElasticsearchProject) },
+							TypeSelector = (o, h) => typeof(ElasticsearchProject)
+						}
+					}
+				}
+			};
+
+			var result = Client.MultiSearch(request);
+			result.IsValid.Should().BeTrue();
+			var response = result.GetResponse<object>("test");
+			var projects = response.Documents.OfType<ElasticsearchProject>().ToList();
+			projects.Count.Should().BeGreaterThan(0);
+		}
+	}
+}

src/Tests/Nest.Tests.Unit/Core/Map/Enums/EnumCanBeOverriddenAfterMapFromAttributes.json

@@ -0,0 +1,10 @@
+{
+  "myclass": {
+    "properties": {
+      "myEnum": {
+        "index": "not_analyzed",
+        "type": "string"
+      }
+    }
+  }
+}

src/Tests/Nest.Tests.Unit/Core/Map/Enums/EnumMappingTests.cs

@@ -0,0 +1,49 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest.Tests.Unit.Core.Map.Enums
+{
+	[TestFixture]
+	public class EnumMappingTests : BaseJsonTests
+	{
+		private class MyClass
+		{
+			public MyEnum MyEnum { get; set; }
+		}
+
+		private enum MyEnum
+		{
+			Value1,
+			Value2
+		}
+
+		[Test]
+		public void EnumShouldMapToIntByDefault()
+		{
+			var result = this._client.Map<MyClass>(m => m.MapFromAttributes());
+			this.JsonEquals(result.ConnectionStatus.Request, MethodBase.GetCurrentMethod());
+		}
+
+		[Test]
+		public void EnumCanBeOverriddenAfterMapFromAttributes()
+		{
+			var result = this._client.Map<MyClass>(m => m
+				.MapFromAttributes()
+				.Properties(props=>props
+					.String(s=>s
+						.Name(p=>p.MyEnum)
+						.Index(FieldIndexOption.NotAnalyzed)
+					)
+				)
+			);
+			this.JsonEquals(result.ConnectionStatus.Request, MethodBase.GetCurrentMethod());
+		}
+
+	}
+
+}

src/Tests/Nest.Tests.Unit/Core/Map/Enums/EnumShouldMapToIntByDefault.json

@@ -0,0 +1,9 @@
+{
+  "myclass": {
+    "properties": {
+      "myEnum": {
+        "type": "integer"
+      }
+    }
+  }
+}