Deprecate Indices query

See elastic/elasticsearch#12017

Author: russcam

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

@@ -1,3 +1,4 @@
+using System;
 using Newtonsoft.Json;
 
 namespace Nest
@@ -114,6 +115,7 @@ public interface IQueryContainer
 		[JsonProperty("nested")]
 		INestedQuery Nested { get; set; }
 
+		[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
 		[JsonProperty("indices")]
 		IIndicesQuery Indices { get; set; }
 

src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs

@@ -37,7 +37,10 @@ public partial class QueryContainer : IQueryContainer, IDescriptor
 		private ISpanWithinQuery _spanWithin;
 		private ISpanMultiTermQuery _spanMultiTerm;
 		private INestedQuery _nested;
+
+#pragma warning disable 618
 		private IIndicesQuery _indices;
+#pragma warning restore 618
 		private IFunctionScoreQuery _functionScore;
 		private ITemplateQuery _template;
 		private IGeoBoundingBoxQuery _geoBoundingBox;
@@ -96,7 +99,9 @@ private T Set<T>(T value) where T : IQuery
 		ISpanWithinQuery IQueryContainer.SpanWithin { get { return _spanWithin; } set { _spanWithin = Set(value); } }
 		ISpanMultiTermQuery IQueryContainer.SpanMultiTerm { get { return _spanMultiTerm; } set { _spanMultiTerm = Set(value); } }
 		INestedQuery IQueryContainer.Nested { get { return _nested; } set { _nested = Set(value); } }
+#pragma warning disable 618
 		IIndicesQuery IQueryContainer.Indices { get { return _indices; } set { _indices = Set(value); } }
+#pragma warning restore 618
 		IFunctionScoreQuery IQueryContainer.FunctionScore { get { return _functionScore; } set { _functionScore = Set(value); } }
 		ITemplateQuery IQueryContainer.Template { get { return _template; } set { _template = Set(value); } }
 		IGeoBoundingBoxQuery IQueryContainer.GeoBoundingBox { get { return _geoBoundingBox; } set { _geoBoundingBox = Set(value); } }

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

@@ -129,7 +129,8 @@ public QueryContainer Conditionless(Func<ConditionlessQueryDescriptor<T>, ICondi
 		/// The indices query can be used when executed across multiple indices, allowing to have a query that executes
 		/// only when executed on an index that matches a specific list of indices, and another query that executes
 		/// when it is executed on an index that does not match the listed indices.
-		/// </summary>
+		/// </summary>
+		[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
 		public QueryContainer Indices(Func<IndicesQueryDescriptor<T>, IIndicesQuery> selector) =>
 			WrapInContainer(selector, (query, container) => container.Indices = query);
 

src/Nest/QueryDsl/Compound/Indices/IndicesQuery.cs

@@ -7,6 +7,7 @@ namespace Nest
 {
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
 	[JsonConverter(typeof(ReadAsTypeJsonConverter<IndicesQueryDescriptor<object>>))]
+	[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
 	public interface IIndicesQuery : IQuery
 	{
 		[JsonProperty("indices")]
@@ -28,6 +29,7 @@ public class NoMatchQueryContainer : QueryContainer
 		public static implicit operator NoMatchQueryContainer(NoMatchShortcut shortcut) => new NoMatchQueryContainer { Shortcut = shortcut };
 	}
 
+	[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
 	public class IndicesQuery : QueryBase, IIndicesQuery
 	{
 		protected override bool Conditionless => IsConditionless(this);
@@ -40,6 +42,7 @@ internal static bool IsConditionless(IIndicesQuery q) =>
 			q.Indices == null || q.NoMatchQuery.NotWritable() && q.Query.NotWritable();
 	}
 
+	[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
 	public class IndicesQueryDescriptor<T>
 		: QueryDescriptorBase<IndicesQueryDescriptor<T>, IIndicesQuery>
 		, IIndicesQuery where T : class

src/Nest/QueryDsl/Query.cs

@@ -85,6 +85,7 @@ public static QueryContainer HasParent<TParent>(Func<HasParentQueryDescriptor<TP
 		public static QueryContainer Ids(Func<IdsQueryDescriptor, IIdsQuery> selector) =>
 			new QueryContainerDescriptor<T>().Ids(selector);
 
+		[Obsolete("Deprecated. You can specify _index on the query to target specific indices")]
 		public static QueryContainer Indices(Func<IndicesQueryDescriptor<T>, IIndicesQuery> selector) =>
 			new QueryContainerDescriptor<T>().Indices(selector);
 

src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs

@@ -98,7 +98,9 @@ private void Write(string queryType, Field field = null)
 
 		public virtual void Visit(IIdsQuery query) => Write("ids");
 
+#pragma warning disable 618
 		public virtual void Visit(IIndicesQuery query) => Write("indices");
+#pragma warning restore 618
 
 		public virtual void Visit(IMatchQuery query) => Write("match", query.Field);
 

src/Nest/QueryDsl/Visitor/QueryVisitor.cs

@@ -37,7 +37,9 @@ public interface IQueryVisitor
 		void Visit(IHasChildQuery query);
 		void Visit(IHasParentQuery query);
 		void Visit(IIdsQuery query);
+#pragma warning disable 618
 		void Visit(IIndicesQuery query);
+#pragma warning restore 618
 		void Visit(IMatchQuery query);
 		void Visit(IMatchAllQuery query);
 		void Visit(IMoreLikeThisQuery query);
@@ -140,7 +142,9 @@ public virtual void Visit(IHasParentQuery query) { }
 
 		public virtual void Visit(IIdsQuery query) { }
 
+#pragma warning disable 618
 		public virtual void Visit(IIndicesQuery query) { }
+#pragma warning restore 618
 
 		public virtual void Visit(IMatchQuery query) { }
 

src/Nest/QueryDsl/Visitor/QueryWalker.cs

@@ -104,12 +104,14 @@ public void Walk(IQueryContainer qd, IQueryVisitor visitor)
 				v.Visit(d);
 				Accept(v, d.Query);
 			});
+#pragma warning disable 618
 			VisitQuery(qd.Indices, visitor, (v, d) =>
 			{
 				v.Visit(d);
 				Accept(v, d.Query);
 				Accept(v, d.NoMatchQuery, VisitorScope.NoMatchQuery);
 			});
+#pragma warning restore 618
 			VisitQuery(qd.Nested, visitor, (v, d) =>
 			{
 				v.Visit(d);
@@ -166,7 +168,7 @@ public void Walk(ISpanQuery qd, IQueryVisitor visitor)
 
 		private static void Accept(IQueryVisitor visitor, IEnumerable<IQueryContainer> queries, VisitorScope scope = VisitorScope.Query)
 		{
-			if (!queries.HasAny()) return;
+			if (queries == null) return;
 			foreach (var f in queries) Accept(visitor, f, scope);
 		}
 
@@ -248,7 +250,7 @@ private static void VisitSpanSubQuery<T>(T qd, IQueryVisitor visitor, Action<IQu
 			if (qd == null) return;
 			VisitQuery(qd, visitor, (v, d) =>
 			{
-				visitor.Visit(qd as ISpanSubQuery);
+				visitor.Visit(qd);
 				scoped(v, d);
 			});
 		}

src/Tests/QueryDsl/Compound/Indices/IndicesNoMatchQueryUsageTests.cs

@@ -2,6 +2,8 @@
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
 
+#pragma warning disable 618 // Deprecated in 5.0.0-alpha2 - see https://github.com/elastic/elasticsearch/issues/12017
+
 namespace Tests.QueryDsl.Compound.Indices
 {
 	public class IndicesNoMatchQueryUsageTests : QueryDslUsageTestsBase

src/Tests/QueryDsl/Compound/Indices/IndicesQueryUsageTests.cs

@@ -3,6 +3,8 @@
 using Tests.Framework.MockData;
 using static Nest.Infer;
 
+#pragma warning disable 618 // Deprecated in 5.0.0-alpha2 - see https://github.com/elastic/elasticsearch/issues/12017
+
 namespace Tests.QueryDsl.Compound.Indices
 {
 	public class IndicesQueryUsageTests : QueryDslUsageTestsBase