Container variant improvements (#6460) (#6464)

* Support name on containers and use for serialisation

* Remove old POC types and IContainer interface

* Remove variant name from variants

* Remove unused future types

Co-authored-by: Steve Gordon <[email protected]>

Author: github-actions[bot]

src/Elastic.Clients.Elasticsearch/Common/Containers/ContainerAndVariantBase.cs

@@ -5,58 +5,16 @@
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-
 namespace Elastic.Clients.Elasticsearch.QueryDsl
 {
-	// TODO - Generate more of these?
+	// TODO - Generate these
 	public partial class TermQuery
 	{
-		public static implicit operator QueryContainer(TermQuery termQuery) => new(termQuery);
+		public static implicit operator QueryContainer(TermQuery termQuery) => QueryContainer.Term(termQuery);
 	}
 
 	public partial class MatchAllQuery
 	{
-		public static implicit operator QueryContainer(MatchAllQuery matchAllQuery) => new(matchAllQuery);
-	}
-
-	public partial class QueryContainer
-	{
-		// TODO - Generate more of these!
-		public TermQuery Term => Variant as TermQuery;
+		public static implicit operator QueryContainer(MatchAllQuery matchAllQuery) => QueryContainer.MatchAll(matchAllQuery);
 	}
 }
-
-namespace Elastic.Clients.Elasticsearch
-{
-	// Stubs until we generate these - Allows the code to compile so we can identify real errors.
-
-	public partial class HttpHeaders : Dictionary<string, Union<string, IReadOnlyCollection<string>>>
-	{
-	}
-
-	public partial class Metadata : Dictionary<string, object>
-	{
-	}
-
-	//public partial class RuntimeFields : Dictionary<Field, RuntimeField>
-	//{
-	//}
-
-	public partial class ApplicationsPrivileges : Dictionary<Name, ResourcePrivileges>
-	{
-	}
-
-	public partial class Privileges : Dictionary<string, bool>
-	{
-	}
-
-	public partial class ResourcePrivileges : Dictionary<Name, Privileges>
-	{
-	}
-
-	// TODO: Implement properly
-	[JsonConverter(typeof(PercentageConverter))]
-	public partial class Percentage
-	{
-	}
-}

src/Elastic.Clients.Elasticsearch/Common/Containers/ContainerBase.cs

@@ -25,7 +25,7 @@
 namespace Elastic.Clients.Elasticsearch.Aggregations
 {
 	[JsonConverter(typeof(AggregationContainerConverter))]
-	public partial class AggregationContainer : IContainer
+	public partial class AggregationContainer
 	{
 		public AggregationContainer(AggregationBase variant) => Variant = variant ?? throw new ArgumentNullException(nameof(variant));
 		internal AggregationBase Variant { get; }

src/Elastic.Clients.Elasticsearch/Common/Containers/ContainerVariantBase.cs

@@ -300,14 +300,12 @@ public override void Write(Utf8JsonWriter writer, DateHistogramAggregation value
 	}
 
 	[JsonConverter(typeof(DateHistogramAggregationConverter))]
-	public partial class DateHistogramAggregation : BucketAggregationBase, TransformManagement.IPivotGroupByContainerVariant
+	public partial class DateHistogramAggregation : BucketAggregationBase, TransformManagement.IPivotGroupByVariant
 	{
 		public DateHistogramAggregation(string name) : base(name)
 		{
 		}
 
-		[JsonIgnore]
-		string TransformManagement.IPivotGroupByContainerVariant.PivotGroupByContainerVariantName => "date_histogram";
 		[JsonInclude]
 		[JsonPropertyName("calendar_interval")]
 		public Elastic.Clients.Elasticsearch.Aggregations.CalendarInterval? CalendarInterval { get; set; }

src/Elastic.Clients.Elasticsearch/Common/Containers/IContainer.cs

@@ -232,14 +232,12 @@ public override void Write(Utf8JsonWriter writer, HistogramAggregation value, Js
 	}
 
 	[JsonConverter(typeof(HistogramAggregationConverter))]
-	public partial class HistogramAggregation : BucketAggregationBase, TransformManagement.IPivotGroupByContainerVariant
+	public partial class HistogramAggregation : BucketAggregationBase, TransformManagement.IPivotGroupByVariant
 	{
 		public HistogramAggregation(string name) : base(name)
 		{
 		}
 
-		[JsonIgnore]
-		string TransformManagement.IPivotGroupByContainerVariant.PivotGroupByContainerVariantName => "histogram";
 		[JsonInclude]
 		[JsonPropertyName("field")]
 		public Elastic.Clients.Elasticsearch.Field? Field { get; set; }