Merge branch 'fix/2.x-querycontainer-instantiations' into 2.x

Author: russcam

src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs

@@ -8,23 +8,25 @@ namespace Nest
 	[JsonObject(MemberSerialization.OptIn)]
 	public class QueryContainerDescriptor<T> : QueryContainer where T : class
 	{
-		private QueryContainerDescriptor<T> Assign(Action<IQueryContainer> assigner) => Fluent.Assign(this, assigner);
-
 		[Obsolete("Scheduled to be removed in 5.0.0.  Setting Strict() at the container level does is a noop and must be set on each individual query.")]
 		public QueryContainerDescriptor<T> Strict(bool strict = true) => this;
 
 		[Obsolete("Scheduled to be removed in 5.0.0.  Setting Verbatim() at the container level is a noop and must be set on each individual query.")]
 		public QueryContainerDescriptor<T> Verbatim(bool verbatim = true) => this;
 
-		private static QueryContainer WrapInContainer<TQuery, TQueryInterface>(
+		private QueryContainer WrapInContainer<TQuery, TQueryInterface>(
 			Func<TQuery, TQueryInterface> create,
 			Action<TQueryInterface, IQueryContainer> assign
 			)
 			where TQuery : class, TQueryInterface, IQuery, new()
 			where TQueryInterface : class, IQuery
-		{
-			var query = create.InvokeOrDefault(new TQuery());
-			var container = new QueryContainerDescriptor<T>();
+		{
+			var container = this.ContainedQuery == null
+				? this
+				: new QueryContainerDescriptor<T>();
+
+			var query = create.InvokeOrDefault(new TQuery());
+
 			IQueryContainer c = container;
 			c.IsVerbatim = query.IsVerbatim;
 			c.IsStrict = query.IsStrict;
@@ -47,9 +49,9 @@ Action<TQueryInterface, IQueryContainer> assign
 		/// Insert raw query json at this position of the query
 		/// <para>Be sure to start your json with '{'</para>
 		/// </summary>
-		/// <param name="rawJson"></param>
-		/// <returns></returns>
-		public QueryContainer Raw(string rawJson) => Assign(a => a.RawQuery = new RawQueryDescriptor(rawJson));
+		/// <param name="rawJson">The query dsl json</param>
+		public QueryContainer Raw(string rawJson) =>
+			WrapInContainer((RawQueryDescriptor descriptor) => descriptor.Raw(rawJson), (query, container) => container.RawQuery = query);
 
 		/// <summary>
 		/// A query that uses a query parser in order to parse its content.