Merge pull request #2264 from elastic/fix/2261

Fix #2261 add missing Routing option to FieldsLookup

Author: gmarz

src/Nest/QueryDsl/Abstractions/FieldLookup/FieldLookup.cs

@@ -9,15 +9,18 @@ public interface IFieldLookup
 	{
 		[JsonProperty("index")]
 		IndexName Index { get; set; }
-		
+
 		[JsonProperty("type")]
 		TypeName Type { get; set; }
-		
+
 		[JsonProperty("id")]
 		Id Id { get; set; }
-		
+
 		[JsonProperty("path")]
 		Field Path { get; set; }
+
+		[JsonProperty("routing")]
+		string Routing { get; set; }
 	}
 
 	public class FieldLookup : IFieldLookup
@@ -26,6 +29,7 @@ public class FieldLookup : IFieldLookup
 		public TypeName Type { get; set; }
 		public Id Id { get; set; }
 		public Field Path { get; set; }
+		public string Routing { get; set; }
 	}
 
 	public class FieldLookupDescriptor<T> : DescriptorBase<FieldLookupDescriptor<T>,IFieldLookup>, IFieldLookup
@@ -34,13 +38,15 @@ public class FieldLookupDescriptor<T> : DescriptorBase<FieldLookupDescriptor<T>,
 		internal Type _ClrType => typeof(T);
 
 		IndexName IFieldLookup.Index { get; set; }
-		
+
 		TypeName IFieldLookup.Type { get; set; }
-		
+
 		Id IFieldLookup.Id { get; set; }
-		
+
 		Field IFieldLookup.Path { get; set; }
 
+		string IFieldLookup.Routing { get; set; }
+
 		public FieldLookupDescriptor()
 		{
 			Self.Type = new TypeName { Type = this._ClrType };
@@ -56,5 +62,7 @@ public FieldLookupDescriptor()
 		public FieldLookupDescriptor<T> Path(Field path) => Assign(a => a.Path = path);
 
 		public FieldLookupDescriptor<T> Path(Expression<Func<T, object>> objectPath) => Assign(a => a.Path = objectPath);
+
+		public FieldLookupDescriptor<T> Routing(string routing) => Assign(a => a.Routing = routing);
 	}
-}
+}

src/Nest/QueryDsl/TermLevel/Terms/TermsQueryJsonConverter.cs

@@ -129,6 +129,10 @@ private void ReadTerms(ITermsQuery termsQuery, JsonReader reader, JsonSerializer
 							reader.Read();
 							ef.Path = reader.Value as string;
 							break;
+						case "routing":
+							reader.Read();
+							ef.Routing = reader.Value as string;
+							break;
 					}
 				}
 				termsQuery.TermsLookup = ef;

src/Tests/QueryDsl/TermLevel/Terms/TermsLookupQueryUsageTests.cs

@@ -20,7 +20,8 @@ public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
 					id = 12,
 					index = "devs",
 					path = "lastName",
-					type = "developer"
+					type = "developer",
+					routing = "myroutingvalue"
 				}
 			}
 		};
@@ -35,7 +36,8 @@ public TermsLookupQueryUsageTests(ReadOnlyCluster cluster, EndpointUsage usage)
 				Id = 12,
 				Index = Index<Developer>(),
 				Type = Type<Developer>(),
-				Path = Field<Developer>(p=>p.LastName)
+				Path = Field<Developer>(p=>p.LastName),
+				Routing = "myroutingvalue"
 			}
 		};
 
@@ -44,7 +46,11 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 				.Name("named_query")
 				.Boost(1.1)
 				.Field(p => p.Description)
-				.TermsLookup<Developer>(e=>e.Path(p=>p.LastName).Id(12))
+				.TermsLookup<Developer>(e => e
+					.Path(p => p.LastName)
+					.Id(12)
+					.Routing("myroutingvalue")
+				)
 			);
 
 		protected override ConditionlessWhen ConditionlessWhen => new ConditionlessWhen<ITermsQuery>(a => a.Terms)
@@ -57,4 +63,4 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 			q => q.TermsLookup.Path = null,
 		};
 	}
-}
+}