renamed .Object(T) in favor of .Id(T), improved naming on Update() and Bulk(Update()) and made them consistent

Mpdreamz · Mpdreamz · commit 8f5e5dd012bf · 2014-07-16T14:44:30.000+02:00
diff --git a/src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs b/src/Nest/DSL/Bulk/BulkUpdateDescriptor.cs
@@ -33,6 +33,7 @@ public BulkUpdateOperation(TDocument inferFrom)
 		{
 			this.InferFrom = inferFrom;
 		}
+		
 		public BulkUpdateOperation(TDocument inferFrom, TPartialDocument update) 
 		{
 			this.InferFrom = inferFrom;
@@ -163,7 +164,7 @@ public BulkUpdateDescriptor<TDocument, TPartialDocument> Id(string id)
 		/// The object to update, if id is not manually set it will be inferred from the object.
 		/// Used ONLY to infer the ID see Document() to apply a partial object merge.
 		/// </summary>
-		public BulkUpdateDescriptor<TDocument, TPartialDocument> InferFrom(TDocument @object, bool useAsUpsert = false)
+		public BulkUpdateDescriptor<TDocument, TPartialDocument> Id(TDocument @object, bool useAsUpsert = false)
 		{
 			Self.InferFrom = @object;
 			if (useAsUpsert) return this.Upsert(@object);
diff --git a/src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs b/src/Nest/DSL/Paths/DocumentOptionalPathDescriptor.cs
@@ -159,7 +159,7 @@ public TDescriptor Id(string id)
 			Self.Id = id;
 			return (TDescriptor)this;
 		}
-		public TDescriptor Object(T @object)
+		public TDescriptor Id(T @object)
 		{
 			Self.IdFrom = @object;
 			return (TDescriptor)this;
diff --git a/src/Nest/DSL/UpdateDescriptor.cs b/src/Nest/DSL/UpdateDescriptor.cs
@@ -81,6 +81,8 @@ public partial class UpdateDescriptor<TDocument,TPartialDocument>
 		where TPartialDocument : class
 	{
 
+		private TDocument _inferFrom { get; set; }
+
 		private IUpdateRequest<TDocument, TPartialDocument> Self { get { return this; } }
 
 		string IUpdateRequest<TDocument, TPartialDocument>.Script { get; set; }
@@ -110,6 +112,15 @@ public UpdateDescriptor<TDocument, TPartialDocument> Params(Func<FluentDictionar
 			return this;
 		}
 
+		public UpdateDescriptor<TDocument, TPartialDocument> Id(TDocument document, bool useAsUpsert)
+		{
+			((IDocumentOptionalPath<UpdateRequestParameters, TDocument>)Self).IdFrom = document;
+			if (useAsUpsert)
+				return this.Upsert(document);
+			return this;
+		}
+
+
 		/// <summary>
 		/// The full document to be created if an existing document does not exist for a partial merge.
 		/// </summary>
@@ -155,8 +166,10 @@ public UpdateDescriptor<TDocument,TPartialDocument> Fields(params Expression<Fun
 			
 		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<UpdateRequestParameters> pathInfo)
 		{
-			if (Self.PartialDocument != null && Self.Id == null)
-				Self.Id = new ElasticInferrer(settings).Id(Self.PartialDocument);
+			if (pathInfo.Id.IsNullOrEmpty())
+			{
+				pathInfo.Id = settings.Inferrer.Id(Self.Upsert);
+			}
 
 			pathInfo.HttpMethod = PathInfoHttpMethod.POST;
 		}
diff --git a/src/Nest/ElasticClient-Index.cs b/src/Nest/ElasticClient-Index.cs
@@ -13,7 +13,7 @@ public IIndexResponse Index<T>(T @object, Func<IndexDescriptor<T>, IndexDescript
 		{
 			@object.ThrowIfNull("object");
 			indexSelector = indexSelector ?? (s => s);
-			var descriptor = indexSelector(new IndexDescriptor<T>().Object(@object));
+			var descriptor = indexSelector(new IndexDescriptor<T>().Id(@object));
 			return this.Dispatch<IndexDescriptor<T>, IndexRequestParameters, IndexResponse>(
 				descriptor,
 				(p, d) => this.RawDispatch.IndexDispatch<IndexResponse>(p, @object));
@@ -34,7 +34,7 @@ public Task<IIndexResponse> IndexAsync<T>(T @object, Func<IndexDescriptor<T>, In
 		{
 			@object.ThrowIfNull("object");
 			indexSelector = indexSelector ?? (s => s);
-			var descriptor = indexSelector(new IndexDescriptor<T>().Object(@object));
+			var descriptor = indexSelector(new IndexDescriptor<T>().Id(@object));
 			return this.DispatchAsync<IndexDescriptor<T>, IndexRequestParameters, IndexResponse, IIndexResponse>(
 				descriptor,
 				(p, d) => this.RawDispatch.IndexDispatchAsync<IndexResponse>(p, @object));
diff --git a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs
@@ -26,7 +26,7 @@ public void BulkUpdateObject()
 			{
 				int id = i;
 				descriptor.Update<ElasticsearchProject, object>(op => op
-					.InferFrom(new ElasticsearchProject { Id = id })
+					.Id(new ElasticsearchProject { Id = id })
 					.PartialDocument(new { name = "SufixedName-" + id})
 				);
 			}
diff --git a/src/Tests/Nest.Tests.Integration/Core/DeleteTests.cs b/src/Tests/Nest.Tests.Integration/Core/DeleteTests.cs
@@ -129,7 +129,7 @@ public void IndexThanDeleteDocumentByObject()
 
 			//act
 			//now remove the item that was added
-			this.Client.Delete<ElasticsearchProject>(f=>f.Object(newDocument).Refresh());
+			this.Client.Delete<ElasticsearchProject>(f=>f.Id(newDocument).Refresh());
 
 			//assert
 			//make sure getting by id returns nothing
@@ -165,7 +165,7 @@ public void IndexThenDeleteUsingRefresh()
 
 			//act
 			//now remove the item that was added
-			this.Client.Delete<ElasticsearchProject>(d=>d.Object(newDocument).Refresh());
+			this.Client.Delete<ElasticsearchProject>(d=>d.Id(newDocument).Refresh());
 
 			//assert
 			//make sure getting by id returns nothing
diff --git a/src/Tests/Nest.Tests.Integration/Core/Exists/DocumentExistsTests.cs b/src/Tests/Nest.Tests.Integration/Core/Exists/DocumentExistsTests.cs
@@ -22,12 +22,12 @@ public void TestSuggest()
 
 			indexResponse.IsValid.Should().BeTrue();
 
-			var existsResponse = this.Client.DocumentExists<ElasticsearchProject>(d => d.Object(elasticsearchProject).Index(tempIndex));
+			var existsResponse = this.Client.DocumentExists<ElasticsearchProject>(d => d.Id(elasticsearchProject).Index(tempIndex));
 			existsResponse.IsValid.Should().BeTrue();
 			existsResponse.Exists.Should().BeTrue();
 			existsResponse.ConnectionStatus.RequestMethod.Should().Be("HEAD");
 			
-			var doesNotExistsResponse = this.Client.DocumentExists<ElasticsearchProject>(d => d.Object(elasticsearchProject).Index(tempIndex + "-random"));
+			var doesNotExistsResponse = this.Client.DocumentExists<ElasticsearchProject>(d => d.Id(elasticsearchProject).Index(tempIndex + "-random"));
 			doesNotExistsResponse.IsValid.Should().BeTrue();
 			doesNotExistsResponse.Exists.Should().BeFalse();
 
diff --git a/src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs b/src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs
@@ -16,7 +16,7 @@ public void TestUpdate()
 			Assert.Greater(project.LOC, 0);
 			var loc = project.LOC;
 			this.Client.Update<ElasticsearchProject>(u => u
-			  .Object(project)
+			  .Id(project)
 			  .Script("ctx._source.loc += 10")
 			  .RetryOnConflict(5)
 			  .Refresh()
diff --git a/src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs b/src/Tests/Nest.Tests.Unit/BigBadUrlUnitTests.cs
@@ -110,7 +110,7 @@ public void TestAllTheUrls()
 			Do("PUT", "/mydefaultindex/doc/_mapping", c => c.Map<Doc>(m => m.MapFromAttributes()));
 			Do("PUT", "/mycustomindex/doc/_mapping", c => c.Map<Doc>(m => m.Index("mycustomindex")));
 			Do("PUT", "/mycustomindex/customtype/_mapping", c => c.Map<Doc>(m => m.Index("mycustomindex").Type("customtype")));
-			Do("GET", "/mydefaultindex/doc/1/_mlt", c => c.MoreLikeThis<Doc>(m => m.Object(new Doc { Id = "1" })));
+			Do("GET", "/mydefaultindex/doc/1/_mlt", c => c.MoreLikeThis<Doc>(m => m.Id(new Doc { Id = "1" })));
 			Do("GET", "/mydefaultindex/doc/1/_mlt", c => c.MoreLikeThis<Doc>(m => m.Id(1)));
 			Do("GET", "/mycustomindex/mycustomtype/1/_mlt", c => c.MoreLikeThis<Doc>(m => m.Id(1).Index("mycustomindex").Type("mycustomtype")));
 			Do("POST", "/_msearch", c => c.MultiSearch(m => m.Search<Doc>(s => s.MatchAll())));
diff --git a/src/Tests/Nest.Tests.Unit/Core/Bulk/BulkTests.cs b/src/Tests/Nest.Tests.Unit/Core/Bulk/BulkTests.cs
@@ -24,7 +24,7 @@ public void BulkOperations()
 					.Document(new ElasticsearchProject { Id = 4 })
 					.VersionType(VersionType.ExternalGte))
 				.Update<ElasticsearchProject, object>(i => i
-					.InferFrom(new ElasticsearchProject { Id = 3 })
+					.Id(new ElasticsearchProject { Id = 3 })
 					.VersionType(VersionType.External)
 					.PartialDocument(new { name = "NEST"})
 				)
@@ -68,7 +68,7 @@ public void BulkUpdateDetails()
 		{
 			var result = this._client.Bulk(b => b
 				.Update<ElasticsearchProject, object>(i => i
-					.InferFrom(new ElasticsearchProject { Id = 3 })
+					.Id(new ElasticsearchProject { Id = 3 })
 					.PartialDocument(new { name = "NEST" })
 					.RetriesOnConflict(4)
 				)
diff --git a/src/Tests/Nest.Tests.Unit/Core/MoreLikeThis/MltUrlTests.cs b/src/Tests/Nest.Tests.Unit/Core/MoreLikeThis/MltUrlTests.cs
@@ -19,7 +19,7 @@ public void MltSimpleById()
 		[Test]
 		public void MltSimpleByObject()
 		{
-			var result = this._client.MoreLikeThis<ElasticsearchProject>(mlt => mlt.Object(new ElasticsearchProject { Id = 1 }));
+			var result = this._client.MoreLikeThis<ElasticsearchProject>(mlt => mlt.Id(new ElasticsearchProject { Id = 1 }));
 			var status = result.ConnectionStatus;
 			StringAssert.EndsWith("/nest_test_data/elasticsearchprojects/1/_mlt", status.RequestUrl);
 			StringAssert.AreEqualIgnoringCase("GET", status.RequestMethod);
@@ -30,7 +30,7 @@ public void MltSimpleByObjectAlternativeIndexAndType()
 			var result = this._client.MoreLikeThis<ElasticsearchProject>(mlt => mlt
 				.Index("someotherindex")
 				.Type("sillytypename")
-				.Object(new ElasticsearchProject { Id = 1 })
+				.Id(new ElasticsearchProject { Id = 1 })
 			);
 			var status = result.ConnectionStatus;
 			StringAssert.EndsWith("/someotherindex/sillytypename/1/_mlt", status.RequestUrl);
diff --git a/src/Tests/Nest.Tests.Unit/Core/Update/UpdateAPIConsistencyTests.cs b/src/Tests/Nest.Tests.Unit/Core/Update/UpdateAPIConsistencyTests.cs
@@ -0,0 +1,98 @@
+﻿using System.Reflection;
+using NUnit.Framework;
+using Nest.Tests.MockData.Domain;
+using NUnit.Framework.Constraints;
+
+namespace Nest.Tests.Unit.Core.Update
+{
+	[TestFixture]
+	public class UpdateAPIConsistencyTests : BaseJsonTests
+	{
+		public class MyDocument
+		{
+			public int Id { get; set; }
+		
+			public string Name { get; set; }
+
+			public string Country { get; set; }
+		}
+
+		public class MyUpdate
+		{
+			public string Name { get; set; }
+		}
+
+		private MyDocument _document = new MyDocument
+		{
+			Id = 1,
+			Name = "My document",
+			Country = "Netherlands"
+		};
+
+		private MyUpdate _updateDocument = new MyUpdate { Name = "Martijn" };
+
+		[Test]
+		public void UpdateAPI_IdFromDocument()
+		{
+			this._client.Update<MyDocument, MyUpdate>(u => u
+				.Id(_document)
+				.PartialDocument(_updateDocument)
+				.PartialDocumentAsUpsert()
+			);
+		}
+
+		[Test]
+		public void BulkUpdateAPI_IdFromDocument()
+		{
+			this._client.Bulk(u => u
+				.Update<MyDocument, MyUpdate>(o=>o
+					.Id(_document)
+					.PartialDocument(_updateDocument)
+					.PartialDocumentAsUpsert()
+				)			
+			);
+		}
+		
+		[Test]
+		public void UpdateAPI_IdFromDocument_PassToUpsert()
+		{
+			this._client.Update<MyDocument, MyUpdate>(u => u
+				.Id(_document, useAsUpsert: true)
+				.PartialDocument(_updateDocument)
+			);
+		}
+
+		[Test]
+		public void BulkUpdateAPI_IdFromDocument_PassToUpsert()
+		{
+			this._client.Bulk(u => u
+				.Update<MyDocument, MyUpdate>(o=>o
+					.Id(_document, useAsUpsert: true)
+					.PartialDocument(_updateDocument)
+				)			
+			);
+		}
+		
+		[Test]
+		public void UpdateAPI_ManualId_WithUpsert()
+		{
+			this._client.Update<MyDocument, MyUpdate>(u => u
+				.Id(_document.Id)
+				.PartialDocument(_updateDocument)
+				.Upsert(_document)
+			);
+		}
+
+		[Test]
+		public void BulkUpdateAPI_ManualId_WithUpsert()
+		{
+			this._client.Bulk(u => u
+				.Update<MyDocument, MyUpdate>(o=>o
+					.Id(_document.Id)
+					.PartialDocument(_updateDocument)
+					.Upsert(_document)
+				)
+			);
+		}
+	}
+}
diff --git a/src/Tests/Nest.Tests.Unit/Core/Update/UpdateRequestTests.cs b/src/Tests/Nest.Tests.Unit/Core/Update/UpdateRequestTests.cs
@@ -12,7 +12,7 @@ public class UpdateRequestTests : BaseJsonTests
 		public void Inferred()
 		{
 			var result = this._client.Update<ElasticsearchProject>(u => u
-				.Object(new ElasticsearchProject { Id = 2 })
+				.Id(new ElasticsearchProject { Id = 2 })
 			);
 			Assert.NotNull(result, "PutWarmer result should not be null");
 			var status = result.ConnectionStatus;
@@ -25,7 +25,7 @@ public void InferredWithOverrides()
 		{
 			var result = this._client.Update<ElasticsearchProject>(u => u
 				.Index("myindex")
-				.Object(new ElasticsearchProject { Id = 2 })
+				.Id(new ElasticsearchProject { Id = 2 })
 			);
 			Assert.NotNull(result, "PutWarmer result should not be null");
 			var status = result.ConnectionStatus;
diff --git a/src/Tests/Nest.Tests.Unit/Core/Update/UpdateTests.cs b/src/Tests/Nest.Tests.Unit/Core/Update/UpdateTests.cs
@@ -48,7 +48,7 @@ public void UpdateUsingPartial()
 			var partialUpdate = new PartialElasticSearchProject { Name = "NEST", Country = "Netherlands" };
 
 			var s = new UpdateDescriptor<ElasticsearchProject, PartialElasticSearchProject>()
-				.Object(originalProject) //only used to infer the id
+				.Id(originalProject) //only used to infer the id
 				.PartialDocument(partialUpdate); //the actual partial update statement;
 
 			this.JsonEquals(s, MethodInfo.GetCurrentMethod());
diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj
@@ -185,6 +185,7 @@
     <Compile Include="Core\UpdateSettings\UpdateSettingsRequestTests.cs" />
     <Compile Include="Core\UpdateSettings\UpdateSettingsTests.cs" />
     <Compile Include="Core\Update\UpdateRequestTests.cs" />
+    <Compile Include="Core\Update\UpdateAPIConsistencyTests.cs" />
     <Compile Include="Core\Validate\ValidateRequestTests.cs" />
     <Compile Include="Core\Versioning\VersioningTests.cs" />
     <Compile Include="Core\Warmers\PutWarmerRequestTests.cs" />

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public BulkUpdateOperation(TDocument inferFrom)`
`33`	`33`	`{`
`34`	`34`	`this.InferFrom = inferFrom;`
`35`	`35`	`}`
	`36`	`+`
`36`	`37`	`public BulkUpdateOperation(TDocument inferFrom, TPartialDocument update)`
`37`	`38`	`{`
`38`	`39`	`this.InferFrom = inferFrom;`
`@@ -163,7 +164,7 @@ public BulkUpdateDescriptor<TDocument, TPartialDocument> Id(string id)`
`163`	`164`	`/// The object to update, if id is not manually set it will be inferred from the object.`
`164`	`165`	`/// Used ONLY to infer the ID see Document() to apply a partial object merge.`
`165`	`166`	`/// </summary>`
`166`		`- public BulkUpdateDescriptor<TDocument, TPartialDocument> InferFrom(TDocument @object, bool useAsUpsert = false)`
	`167`	`+ public BulkUpdateDescriptor<TDocument, TPartialDocument> Id(TDocument @object, bool useAsUpsert = false)`
`167`	`168`	`{`
`168`	`169`	`Self.InferFrom = @object;`
`169`	`170`	`if (useAsUpsert) return this.Upsert(@object);`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public TDescriptor Id(string id)`
`159`	`159`	`Self.Id = id;`
`160`	`160`	`return (TDescriptor)this;`
`161`	`161`	`}`
`162`		`- public TDescriptor Object(T @object)`
	`162`	`+ public TDescriptor Id(T @object)`
`163`	`163`	`{`
`164`	`164`	`Self.IdFrom = @object;`
`165`	`165`	`return (TDescriptor)this;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void BulkUpdateObject()`
`26`	`26`	`{`
`27`	`27`	`int id = i;`
`28`	`28`	`descriptor.Update<ElasticsearchProject, object>(op => op`
`29`		`- .InferFrom(new ElasticsearchProject { Id = id })`
	`29`	`+ .Id(new ElasticsearchProject { Id = id })`
`30`	`30`	`.PartialDocument(new { name = "SufixedName-" + id})`
`31`	`31`	`);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void BulkOperations()`
`24`	`24`	`.Document(new ElasticsearchProject { Id = 4 })`
`25`	`25`	`.VersionType(VersionType.ExternalGte))`
`26`	`26`	`.Update<ElasticsearchProject, object>(i => i`
`27`		`- .InferFrom(new ElasticsearchProject { Id = 3 })`
	`27`	`+ .Id(new ElasticsearchProject { Id = 3 })`
`28`	`28`	`.VersionType(VersionType.External)`
`29`	`29`	`.PartialDocument(new { name = "NEST"})`
`30`	`30`	`)`
`@@ -68,7 +68,7 @@ public void BulkUpdateDetails()`
`68`	`68`	`{`
`69`	`69`	`var result = this._client.Bulk(b => b`
`70`	`70`	`.Update<ElasticsearchProject, object>(i => i`
`71`		`- .InferFrom(new ElasticsearchProject { Id = 3 })`
	`71`	`+ .Id(new ElasticsearchProject { Id = 3 })`
`72`	`72`	`.PartialDocument(new { name = "NEST" })`
`73`	`73`	`.RetriesOnConflict(4)`
`74`	`74`	`)`