Do not set _id and routing automatically (#3805)

This commit updates LikeDocument so that _id and routing are not
set when a document input is used.

Routing is required in the MoreLikeThisFullDocumentQueryUsageTests because the Project type mapping
requires routing, but this should not be the default.

Fixes #3977

Author: russcam

src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs

@@ -3,55 +3,80 @@
 
 namespace Nest
 {
+
+	/// <summary>
+	/// An indexed or artificial document with which to find likeness
+	/// </summary>
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[ContractJsonConverter(typeof(ReadAsTypeJsonConverter<LikeDocument<object>>))]
 	public interface ILikeDocument
 	{
+		/// <summary>
+		/// A document to find other documents like
+		/// </summary>
 		[JsonProperty("doc")]
 		[JsonConverter(typeof(SourceConverter))]
 		object Document { get; set; }
 
+		/// <summary>
+		/// The fields to use for likeness
+		/// </summary>
 		[JsonProperty("fields")]
 		Fields Fields { get; set; }
 
+		/// <summary>
+		/// The id of an indexed document to find other documents like
+		/// </summary>
 		[JsonProperty("_id")]
 		Id Id { get; set; }
 
+		/// <summary>
+		/// The index of an indexed document to find other documents like
+		/// </summary>
 		[JsonProperty("_index")]
 		IndexName Index { get; set; }
 
+		/// <summary>
+		/// A different analyzer than the one defined for the target fields
+		/// </summary>
 		[JsonProperty("per_field_analyzer")]
 		IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
+		/// <summary>
+		/// The routing value of an indexed document to find other documents like
+		/// </summary>
 		[JsonProperty("_routing")]
 		Routing Routing { get; set; }
 
 		[JsonProperty("_type")]
 		TypeName Type { get; set; }
 	}
 
+	/// <inheritdoc />
 	public abstract class LikeDocumentBase : ILikeDocument
 	{
-		private Routing _routing;
-
+		/// <inheritdoc />
 		public object Document { get; set; }
 
+		/// <inheritdoc />
 		public Fields Fields { get; set; }
 
+		/// <inheritdoc />
 		public Id Id { get; set; }
+
+		/// <inheritdoc />
 		public IndexName Index { get; set; }
 
+		/// <inheritdoc />
 		public IPerFieldAnalyzer PerFieldAnalyzer { get; set; }
 
-		public Routing Routing
-		{
-			get => _routing ?? (Document == null ? null : new Routing(Document));
-			set => _routing = value;
-		}
-
 		public TypeName Type { get; set; }
+
+		/// <inheritdoc />
+		public Routing Routing { get; set; }
 	}
 
+	/// <inheritdoc cref="ILikeDocument" />
 	public class LikeDocument<TDocument> : LikeDocumentBase
 		where TDocument : class
 	{
@@ -66,17 +91,16 @@ public LikeDocument(Id id)
 
 		public LikeDocument(TDocument document)
 		{
-			Id = Id.From(document);
 			Document = document;
 			Index = typeof(TDocument);
 			Type = typeof(TDocument);
 		}
 	}
 
+	/// <inheritdoc cref="ILikeDocument" />
 	public class LikeDocumentDescriptor<TDocument> : DescriptorBase<LikeDocumentDescriptor<TDocument>, ILikeDocument>, ILikeDocument
 		where TDocument : class
 	{
-		private Routing _routing;
 
 		public LikeDocumentDescriptor()
 		{
@@ -85,39 +109,36 @@ public LikeDocumentDescriptor()
 		}
 
 		object ILikeDocument.Document { get; set; }
-
 		Fields ILikeDocument.Fields { get; set; }
 		Id ILikeDocument.Id { get; set; }
 		IndexName ILikeDocument.Index { get; set; }
 		IPerFieldAnalyzer ILikeDocument.PerFieldAnalyzer { get; set; }
-
-		Routing ILikeDocument.Routing
-		{
-			get => _routing ?? (Self.Document == null ? null : new Routing(Self.Document));
-			set => _routing = value;
-		}
+		Routing ILikeDocument.Routing { get; set; }
 
 		TypeName ILikeDocument.Type { get; set; }
 
+		/// <inheritdoc cref="ILikeDocument.Index" />
 		public LikeDocumentDescriptor<TDocument> Index(IndexName index) => Assign(index, (a, v) => a.Index = v);
 
 		public LikeDocumentDescriptor<TDocument> Type(TypeName type) => Assign(type, (a, v) => a.Type = v);
 
+		/// <inheritdoc cref="ILikeDocument.Id" />
 		public LikeDocumentDescriptor<TDocument> Id(Id id) => Assign(id, (a, v) => a.Id = v);
 
+		/// <inheritdoc cref="ILikeDocument.Routing" />
 		public LikeDocumentDescriptor<TDocument> Routing(Routing routing) => Assign(routing, (a, v) => a.Routing = v);
 
+		/// <inheritdoc cref="ILikeDocument.Fields" />
 		public LikeDocumentDescriptor<TDocument> Fields(Func<FieldsDescriptor<TDocument>, IPromise<Fields>> fields) =>
 			Assign(fields, (a, v) => a.Fields = v?.Invoke(new FieldsDescriptor<TDocument>())?.Value);
 
+		/// <inheritdoc cref="ILikeDocument.Fields" />
 		public LikeDocumentDescriptor<TDocument> Fields(Fields fields) => Assign(fields, (a, v) => a.Fields = v);
 
-		public LikeDocumentDescriptor<TDocument> Document(TDocument document) => Assign(document,  (a, v) =>
-		{
-			a.Id = Infer.Id(v);
-			a.Document = v;
-		});
+		/// <inheritdoc cref="ILikeDocument.Document" />
+		public LikeDocumentDescriptor<TDocument> Document(TDocument document) => Assign(document, (a, v) => a.Document = v);
 
+		/// <inheritdoc cref="ILikeDocument.PerFieldAnalyzer" />
 		public LikeDocumentDescriptor<TDocument> PerFieldAnalyzer(
 			Func<PerFieldAnalyzerDescriptor<TDocument>, IPromise<IPerFieldAnalyzer>> analyzerSelector
 		) =>

src/Tests/Tests/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisFullDocumentQueryUsageTests.cs

@@ -16,7 +16,7 @@ public MoreLikeThisFullDocumentQueryUsageTests(ReadOnlyCluster i, EndpointUsage
 		{
 			Like = new List<Like>
 			{
-				new LikeDocument<Project>(Project.Instance),
+				new LikeDocument<Project>(Project.Instance) { Routing = Project.Instance.Name },
 				"some long text"
 			}
 		};
@@ -31,9 +31,8 @@ public MoreLikeThisFullDocumentQueryUsageTests(ReadOnlyCluster i, EndpointUsage
 					{
 						_index = "project",
 						_type = "doc",
-						_id = Project.Instance.Name,
-						_routing = Project.Instance.Name,
-						doc = Project.InstanceAnonymous
+						doc = Project.InstanceAnonymous,
+						_routing = Project.Instance.Name
 					},
 					"some long text"
 				}
@@ -43,7 +42,10 @@ public MoreLikeThisFullDocumentQueryUsageTests(ReadOnlyCluster i, EndpointUsage
 		protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project> q) => q
 			.MoreLikeThis(sn => sn
 				.Like(l => l
-					.Document(d => d.Document(Project.Instance))
+					.Document(d => d
+						.Document(Project.Instance)
+						.Routing(Project.Instance.Name)
+					)
 					.Text("some long text")
 				)
 			);