fix #2389 add support for .UpdateMany() inside .Bulk() (#2433)

Conflicts:
	src/Nest/Document/Multiple/Bulk/BulkRequest.cs
	src/Tests/Tests.csproj

Author: Mpdreamz

src/.vs/Elasticsearch.sqlite

@@ -63,7 +63,7 @@ public BulkDescriptor DeleteMany<T>(IEnumerable<T> @objects, Func<BulkDeleteDesc
 		/// </summary>
 		/// <param name="ids">Enumerable of string ids to delete</param>
 		/// <param name="bulkDeleteSelector">A func called on each ids to describe the individual delete operation</param>
-		public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDescriptor<T>, string, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class=>
+		public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDescriptor<T>, string, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
 			Assign(a => ids.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Id(o), o))));
 
 		/// <summary>
@@ -74,7 +74,25 @@ public BulkDescriptor DeleteMany<T>(IEnumerable<string> ids, Func<BulkDeleteDesc
 		public BulkDescriptor DeleteMany<T>(IEnumerable<long> ids, Func<BulkDeleteDescriptor<T>, long, IBulkDeleteOperation<T>> bulkDeleteSelector = null) where T : class =>
 			Assign(a => ids.ForEach(o => AddOperation(bulkDeleteSelector.InvokeOrDefault(new BulkDeleteDescriptor<T>().Id(o), o))));
 
-		public BulkDescriptor Update<T>(Func<BulkUpdateDescriptor<T, T>, IBulkUpdateOperation<T, T>> bulkUpdateSelector) where T : class => 
+		/// <summary>
+		/// Updatemany, convenience method to pass many objects at once to do multiple updates.
+		/// </summary>
+		/// <param name="objects">the objects to update</param>
+		/// <param name="bulkUpdateSelector">An func called on each object to describe the individual update operation</param>
+		public BulkDescriptor UpdateMany<T>(IEnumerable<T> @objects, Func<BulkUpdateDescriptor<T, T>, T, IBulkUpdateOperation<T, T>> bulkUpdateSelector) where T : class =>
+			Assign(a => @objects.ForEach(o => AddOperation(bulkUpdateSelector.InvokeOrDefault(new BulkUpdateDescriptor<T, T>().IdFrom(o), o))));
+
+		/// <summary>
+		/// Updatemany, convenience method to pass many objects at once to do multiple updates.
+		/// </summary>
+		/// <param name="objects">the objects to update</param>
+		/// <param name="bulkUpdateSelector">An func called on each object to describe the individual update operation</param>
+		public BulkDescriptor UpdateMany<T, TPartialDocument>(IEnumerable<T> @objects, Func<BulkUpdateDescriptor<T, TPartialDocument>, T, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector)
+			where T : class
+			where TPartialDocument : class =>
+			Assign(a => @objects.ForEach(o => AddOperation(bulkUpdateSelector.InvokeOrDefault(new BulkUpdateDescriptor<T, TPartialDocument>().IdFrom(o), o))));
+
+		public BulkDescriptor Update<T>(Func<BulkUpdateDescriptor<T, T>, IBulkUpdateOperation<T, T>> bulkUpdateSelector) where T : class =>
 			this.Update<T, T>(bulkUpdateSelector);
 
 		public BulkDescriptor Update<T, TPartialDocument>(Func<BulkUpdateDescriptor<T, TPartialDocument>, IBulkUpdateOperation<T, TPartialDocument>> bulkUpdateSelector)

src/Nest/Document/Multiple/Bulk/BulkRequest.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Elasticsearch.Net;
+using FluentAssertions;
+using Nest;
+using Tests.Framework;
+using Tests.Framework.Integration;
+using Tests.Framework.MockData;
+using Xunit;
+
+namespace Tests.Document.Multiple.Bulk
+{
+	public class BulkUpdateManyTests : ApiTestBase<ReadOnlyCluster, IBulkResponse, IBulkRequest, BulkDescriptor, BulkRequest>
+	{
+		private List<Project> Updates = Project.Projects.Take(10).ToList();
+
+		public BulkUpdateManyTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+		protected override LazyResponses ClientUsage() => Calls(
+			fluent: (client, f) => client.Bulk(f),
+			fluentAsync: (client, f) => client.BulkAsync(f),
+			request: (client, r) => client.Bulk(r),
+			requestAsync: (client, r) => client.BulkAsync(r)
+		);
+
+		protected override HttpMethod HttpMethod => HttpMethod.POST;
+		protected override string UrlPath => $"/{CallIsolatedValue}/_bulk";
+
+		protected override bool SupportsDeserialization => false;
+
+		protected override object ExpectJson => Updates.SelectMany<Project, object>(ProjectToBulkJson);
+
+		private IEnumerable<object> ProjectToBulkJson(Project p)
+		{
+			yield return new Dictionary<string, object> { { "update", new { _type = "project", _id = p.Name } } };
+			yield return new { script = new { inline = "_source.counter++" } };
+		}
+
+		protected override Func<BulkDescriptor, IBulkRequest> Fluent => d => d
+			.Index(CallIsolatedValue)
+			.UpdateMany(Updates, (b, u) => b.Script("_source.counter++"));
+
+
+		protected override BulkRequest Initializer => new BulkRequest(CallIsolatedValue)
+		{
+			Operations = Updates
+				.Select(u=> new BulkUpdateOperation<Project, Project>(u) { Script = "_source.counter++" })
+				.ToList<IBulkOperation>()
+		};
+	}
+}

src/Tests/Document/Multiple/Bulk/BulkUpdateManyTests.cs

@@ -239,6 +239,7 @@
     <Compile Include="ClientConcepts\ConnectionPooling\Dispose\ResponseBuilderDisposeTests.cs" />
     <Compile Include="ClientConcepts\Connection\CustomConnections.cs" />
     <Compile Include="Document\Multiple\BulkAll\BulkAllApiTests.cs" />
+    <Compile Include="Document\Multiple\Bulk\BulkUpdateManyTests.cs" />
     <Compile Include="Document\Multiple\ReindexRethrottle\ReindexRethrottleApiTests.cs" />
     <Compile Include="Document\Multiple\ReindexRethrottle\ReindexRethrottleUrlTests.cs" />
     <Compile Include="Framework\Extensions\ShouldExtensions.cs" />

src/Tests/Tests.csproj

@@ -1,10 +1,10 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: m
+mode: u
 # the elasticsearch version that should be started
 elasticsearch_version: 2.4.1
 # cluster filter allows you to only run the integration tests of a particular cluster (cluster suffix not needed)
 cluster_filter: 
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
 # do not spawn nodes as part of the test setup but rely on a manually started es node being up
-do_not_spawn: false
+do_not_spawn: false