type on has_parent query should be parent_type' (#2999)

Author: Mpdreamz

src/Nest/QueryDsl/Joining/HasParent/HasParentQuery.cs

@@ -7,8 +7,8 @@ namespace Nest
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<HasParentQueryDescriptor<object>>))]
 	public interface IHasParentQuery : IQuery
 	{
-		[JsonProperty("type")]
-		TypeName Type { get; set; }
+		[JsonProperty("parent_type")]
+		TypeName ParentType { get; set; }
 
 		/// <summary>
 		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
@@ -30,7 +30,7 @@ public interface IHasParentQuery : IQuery
 	public class HasParentQuery : QueryBase, IHasParentQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
-		public TypeName Type { get; set; }
+		public TypeName ParentType { get; set; }
 
 		/// <summary>
 		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
@@ -42,15 +42,15 @@ public class HasParentQuery : QueryBase, IHasParentQuery
 		public bool? IgnoreUnmapped { get; set; }
 
 		internal override void InternalWrapInContainer(IQueryContainer c) => c.HasParent = this;
-		internal static bool IsConditionless(IHasParentQuery q) => q.Query == null || q.Query.IsConditionless || q.Type == null;
+		internal static bool IsConditionless(IHasParentQuery q) => q.Query == null || q.Query.IsConditionless || q.ParentType == null;
 	}
 
 	public class HasParentQueryDescriptor<T>
 		: QueryDescriptorBase<HasParentQueryDescriptor<T>, IHasParentQuery>
 		, IHasParentQuery where T : class
 	{
 		protected override bool Conditionless => HasParentQuery.IsConditionless(this);
-		TypeName IHasParentQuery.Type { get; set; }
+		TypeName IHasParentQuery.ParentType { get; set; }
 
 		/// <summary>
 		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.
@@ -61,12 +61,12 @@ public class HasParentQueryDescriptor<T>
 		QueryContainer IHasParentQuery.Query { get; set; }
 		bool? IHasParentQuery.IgnoreUnmapped { get; set; }
 
-		public HasParentQueryDescriptor() { Self.Type = TypeName.Create<T>(); }
+		public HasParentQueryDescriptor() { Self.ParentType = TypeName.Create<T>(); }
 
 		public HasParentQueryDescriptor<T> Query(Func<QueryContainerDescriptor<T>, QueryContainer> selector) =>
 			Assign(a => a.Query = selector?.Invoke(new QueryContainerDescriptor<T>()));
 
-		public HasParentQueryDescriptor<T> Type(string type) => Assign(a => a.Type = type);
+		public HasParentQueryDescriptor<T> ParentType(string type) => Assign(a => a.ParentType = type);
 
 		/// <summary>
 		/// Determines whether the score of the matching parent document is aggregated into the child documents belonging to the matching parent document.

src/Tests/QueryDsl/Joining/HasParent/HasParentQueryUsageTests.cs

@@ -15,7 +15,7 @@ public HasParentUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usa
 			{
 				_name = "named_query",
 				boost = 1.1,
-				type = "developer",
+				parent_type = "developer",
 				score = true,
 				ignore_unmapped = true,
 				query = new
@@ -33,7 +33,7 @@ public HasParentUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usa
 		{
 			Name = "named_query",
 			Boost = 1.1,
-			Type = Infer.Type<Developer>(),
+			ParentType = Infer.Type<Developer>(),
 			InnerHits = new InnerHits { Explain = true },
 			Query = new MatchAllQuery(),
 			Score = true,
@@ -54,7 +54,7 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
 		{
 			q =>  q.Query = null,
 			q =>  q.Query = ConditionlessQuery,
-			q =>  q.Type = null,
+			q =>  q.ParentType = null,
 		};
 	}
 }