Merge pull request #1489 from elastic/fix/update-get-response

fix #1296 map get response on the update response

Author: gmarz

Diff for: src/Nest/Domain/Responses/UpdateResponse.cs

@@ -1,4 +1,6 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Nest.Domain;
+using Newtonsoft.Json;
 
 namespace Nest
 {
@@ -9,6 +11,10 @@ public interface IUpdateResponse : IResponse
 		string Type { get; }
 		string Id { get; }
 		string Version { get; }
+		GetFromUpdate Get { get;  }
+
+		T Source<T>() where T : class;
+		FieldSelection<T> Fields<T>() where T : class;
 	}
 
 	[JsonObject]
@@ -25,5 +31,36 @@ public class UpdateResponse : BaseResponse, IUpdateResponse
 		public string Id { get; private set; }
 		[JsonProperty(PropertyName = "_version")]
 		public string Version { get; private set; }
+
+		[JsonProperty(PropertyName = "get")]
+		public GetFromUpdate Get { get; private set; }
+
+		public T Source<T>() where T : class
+		{
+			if (this.Get == null) return null;
+			return this.Get.Source.As<T>();
+		}
+
+		public FieldSelection<T> Fields<T>() where T : class
+		{
+			if (this.Get == null) return null;
+			return new FieldSelection<T>(this.Settings, this.Get._fields);
+		}
+	}
+
+	[JsonObject]
+	public class GetFromUpdate
+	{
+		[JsonProperty(PropertyName = "found")]
+		public bool Found { get; set; }
+
+		[JsonProperty(PropertyName = "_source")]
+		internal IDocument Source { get; set; }
+
+
+		[JsonProperty(PropertyName = "fields")]
+		internal IDictionary<string, object> _fields { get; set; }
+
+
 	}
 }

Diff for: src/Tests/Nest.Tests.Integration/Core/UpdateTests.cs

@@ -16,17 +16,27 @@ public void TestUpdate()
 			Assert.NotNull(project);
 			Assert.Greater(project.LOC, 0);
 			var loc = project.LOC;
-			this.Client.Update<ElasticsearchProject>(u => u
-			  .IdFrom(project)
-			  .Script("ctx._source.loc += 10")
-			  .RetryOnConflict(5)
-			  .Refresh()
+			var update = this.Client.Update<ElasticsearchProject>(u => u
+				.IdFrom(project)
+				.Script("ctx._source.loc += 10")
+				.Fields("_source", "loc")
+				.RetryOnConflict(5)
+				.Refresh()
 			);
 			project = this.Client.Source<ElasticsearchProject>(s => s.Id(1));
 			Assert.AreEqual(project.LOC, loc + 10);
 			Assert.AreNotEqual(project.Version, "1");
+
+			update.Get.Should().NotBeNull();
+			update.Get.Found.Should().BeTrue();
+			update.Source<ElasticsearchProject>().Should().NotBeNull();
+			update.Source<ElasticsearchProject>().LOC.Should().Be(loc + 10);
+			var fieldLoc = update.Fields<ElasticsearchProject>().FieldValues(p => p.LOC);
+			fieldLoc.Should().HaveCount(1);
+			fieldLoc.First().Should().Be(loc + 10);
+
 		}
-		
+
 		[Test]
 		public void TestUpdate_ObjectInitializer()
 		{
@@ -49,7 +59,7 @@ public void TestUpdate_ObjectInitializer()
 		public class ElasticsearchProjectLocUpdate
 		{
 			public int Id { get; set; }
-			[ElasticProperty(Name="loc",AddSortField=true)]
+			[ElasticProperty(Name = "loc", AddSortField = true)]
 			public int LOC { get; set; }
 		}