Fix #860 GetMany() nullifies _index and _type

Author: Mpdreamz

Diff for: src/Elasticsearch.Net/Connection/InMemoryConnection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Text;
@@ -13,23 +14,27 @@ public class InMemoryConnection : HttpConnection
 		private byte[] _fixedResultBytes = Encoding.UTF8.GetBytes("{ \"USING NEST IN MEMORY CONNECTION\"  : null }");
 		private int _statusCode;
 
-		public InMemoryConnection()
-			: base(new ConnectionConfiguration())
+		public List<Tuple<string, Uri, byte[]>> Requests = new List<Tuple<string, Uri, byte[]>>(); 
+		
+		public bool RecordRequests { get; set;}
+
+		public InMemoryConnection() : base(new ConnectionConfiguration())
 		{
 
 		}
-		public InMemoryConnection(IConnectionConfigurationValues settings)
-			: base(settings)
+		public InMemoryConnection(IConnectionConfigurationValues settings) : base(settings)
 		{
 			_statusCode = 200;
 		}
 
-		public InMemoryConnection(IConnectionConfigurationValues settings, string fixedResult, int statusCode = 200)
-			: this(settings)
+		public InMemoryConnection(IConnectionConfigurationValues settings, string fixedResult, int statusCode = 200) : this(settings)
 		{
 			_fixedResultBytes = Encoding.UTF8.GetBytes(fixedResult);
 			_statusCode = statusCode;
 		}
+		
+		
+
 
 		protected override ElasticsearchResponse<Stream> DoSynchronousRequest(HttpWebRequest request, byte[] data = null, IRequestConfiguration requestSpecificConfig = null)
 		{
@@ -45,6 +50,12 @@ private ElasticsearchResponse<Stream> ReturnConnectionStatus(HttpWebRequest requ
 			cs.Response = new MemoryStream(_fixedResultBytes);
 			if (this.ConnectionSettings.ConnectionStatusHandler != null)
 				this.ConnectionSettings.ConnectionStatusHandler(cs);
+
+			if (this.RecordRequests)
+			{
+				this.Requests.Add(Tuple.Create(method, request.RequestUri, data));
+			}
+
 			return cs;
 		}
 

Diff for: src/Nest/DSL/MultiGet/MultiGetOperationDescriptor.cs

@@ -53,6 +53,7 @@ public MultiGetOperationDescriptor()
 		/// </summary>
 		public MultiGetOperationDescriptor<T> Index(string index)
 		{
+			if (index.IsNullOrEmpty()) return this;
 			Self.Index = index;
 			return this;
 		}
@@ -62,6 +63,7 @@ public MultiGetOperationDescriptor<T> Index(string index)
 		/// </summary>
 		public MultiGetOperationDescriptor<T> Type(string type)
 		{
+			if (type.IsNullOrEmpty()) return this;
 			Self.Type = type;
 			return this;
 		}
@@ -71,6 +73,7 @@ public MultiGetOperationDescriptor<T> Type(string type)
 		/// </summary>
 		public MultiGetOperationDescriptor<T> Type(Type type)
 		{
+			if (type == null) return this;
 			Self.Type = type;
 			return this;
 		}

Diff for: src/Tests/Nest.Tests.Unit/BaseJsonTests.cs

@@ -29,8 +29,10 @@ public class BaseJsonTests
 		public BaseJsonTests()
 		{
 			this._settings = new ConnectionSettings(UnitTestDefaults.Uri, UnitTestDefaults.DefaultIndex)
+				.DisablePing()
 				.ExposeRawResponse();
-			this._connection = new InMemoryConnection(this._settings);
+			var connection = new InMemoryConnection(this._settings);
+			this._connection = connection;
 			this._client = new ElasticClient(this._settings, this._connection);
 		}
 

Diff for: src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -363,6 +363,7 @@
     <Compile Include="QueryParsers\Visitor\VisitorTests.cs" />
     <Compile Include="Reproduce\Reproduce646Tests.cs" />
     <Compile Include="Reproduce\Reproduce579Tests.cs" />
+    <Compile Include="Reproduce\Reproduce860Tests.cs" />
     <Compile Include="Reproduce\Reproduce806Tests.cs" />
     <Compile Include="Search\Fields\FieldsTests.cs" />
     <Compile Include="Search\Filter\Modes\ConditionlessFilterJson.cs" />

Diff for: src/Tests/Nest.Tests.Unit/Reproduce/Reproduce860Tests.cs

@@ -0,0 +1,43 @@
+using System.IO;
+using Elasticsearch.Net;
+using Elasticsearch.Net.Connection;
+using Elasticsearch.Net.Connection.Configuration;
+using FluentAssertions;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest.Tests.Unit.Reproduce
+{
+
+	[TestFixture]
+	public class Reproduce860Tests : BaseJsonTests
+	{
+		[Test]
+		public void ConvenienceExtensionShouldGenerateExactBodyAsMethodOnClient()
+		{
+			var connection = new InMemoryConnection(this._settings) { RecordRequests = true };
+			var client = new ElasticClient(this._settings, connection);
+
+			var response = client.GetMany<ElasticsearchProject>(new[] { "123" });
+            var response2 = client.MultiGet(s => s.GetMany<ElasticsearchProject>(new[] { "123" }));
+			
+			connection.Requests.Should().NotBeEmpty().And.HaveCount(2);
+
+			var getManyRequest = connection.Requests[0];
+			var multiGetRequest = connection.Requests[1];
+
+			getManyRequest.Item3.Should().NotBeNull()
+				.And.BeEquivalentTo(multiGetRequest.Item3);
+
+			getManyRequest.Item3.Utf8String().Should().Contain("_index\":");
+			getManyRequest.Item3.Utf8String().Should().Contain("_type\":");
+				
+
+		}
+	}
+}