Improve open enumeration code-gen (#6697)

stevejgordon · github-actions[bot] · commit ca84b4307c03 · 2022-10-03T13:05:07.000Z
diff --git a/src/Elastic.Clients.Elasticsearch/Serialization/StringAliasConverter.cs b/src/Elastic.Clients.Elasticsearch/Serialization/StringAliasConverter.cs
@@ -38,19 +38,16 @@ public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions
 	}
 }
 
-
-internal sealed class EnumStructConverter<T> : JsonConverter<T>
+internal sealed class EnumStructConverter<T> : JsonConverter<T> where T : new()
 {
-	// TODO: Rename if not valid
-
 	public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
 	{
 		var value = reader.GetString();
 
 		var instance = (T)Activator.CreateInstance(
 			typeof(T),
 			BindingFlags.Instance | BindingFlags.NonPublic,
-			args: new object[] { value },
+			args: new object[] { value }, // TODO: Perf - Review use of ArrayPool
 			binder: null,
 			culture: null)!;
 
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Enums/Enums.NoNamespace.g.cs
@@ -801,11 +801,23 @@ public override void Write(Utf8JsonWriter writer, HighlighterTagsSchema value, J
 		}
 	}
 
-	public partial struct HighlighterType
+	[JsonConverter(typeof(EnumStructConverter<HighlighterType>))]
+	public readonly partial struct HighlighterType
 	{
-		public const string Unified = "unified";
-		public const string Plain = "plain";
-		public const string FastVector = "fvh";
+		public HighlighterType(string value) => Value = value;
+		public readonly string Value { get; }
+
+		public static HighlighterType Unified { get; } = new HighlighterType("unified");
+		public static HighlighterType Plain { get; } = new HighlighterType("plain");
+		public static HighlighterType FastVector { get; } = new HighlighterType("fvh");
+		public override string ToString() => Value ?? string.Empty;
+		public static implicit operator string(HighlighterType highlighterType) => highlighterType.Value;
+		public static implicit operator HighlighterType(string value) => new(value);
+		public override int GetHashCode() => Value.GetHashCode();
+		public override bool Equals(object obj) => obj is HighlighterType other && this.Equals(other);
+		public bool Equals(HighlighterType other) => Value == other.Value;
+		public static bool operator ==(HighlighterType a, HighlighterType b) => a.Equals(b);
+		public static bool operator !=(HighlighterType a, HighlighterType b) => !(a == b);
 	}
 
 	[JsonConverter(typeof(IBDistributionConverter))]
@@ -1305,12 +1317,24 @@ public override void Write(Utf8JsonWriter writer, ScoreMode value, JsonSerialize
 		}
 	}
 
-	public partial struct ScriptLanguage
+	[JsonConverter(typeof(EnumStructConverter<ScriptLanguage>))]
+	public readonly partial struct ScriptLanguage
 	{
-		public const string Painless = "painless";
-		public const string Mustache = "mustache";
-		public const string Java = "java";
-		public const string Expression = "expression";
+		public ScriptLanguage(string value) => Value = value;
+		public readonly string Value { get; }
+
+		public static ScriptLanguage Painless { get; } = new ScriptLanguage("painless");
+		public static ScriptLanguage Mustache { get; } = new ScriptLanguage("mustache");
+		public static ScriptLanguage Java { get; } = new ScriptLanguage("java");
+		public static ScriptLanguage Expression { get; } = new ScriptLanguage("expression");
+		public override string ToString() => Value ?? string.Empty;
+		public static implicit operator string(ScriptLanguage scriptLanguage) => scriptLanguage.Value;
+		public static implicit operator ScriptLanguage(string value) => new(value);
+		public override int GetHashCode() => Value.GetHashCode();
+		public override bool Equals(object obj) => obj is ScriptLanguage other && this.Equals(other);
+		public bool Equals(ScriptLanguage other) => Value == other.Value;
+		public static bool operator ==(ScriptLanguage a, ScriptLanguage b) => a.Equals(b);
+		public static bool operator !=(ScriptLanguage a, ScriptLanguage b) => !(a == b);
 	}
 
 	[JsonConverter(typeof(ScriptSortTypeConverter))]
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Highlight.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Highlight.g.cs
@@ -116,7 +116,7 @@ public sealed partial class Highlight
 
 		[JsonInclude]
 		[JsonPropertyName("type")]
-		public string? Type { get; set; }
+		public Elastic.Clients.Elasticsearch.HighlighterType? Type { get; set; }
 	}
 
 	public sealed partial class HighlightDescriptor<TDocument> : SerializableDescriptorBase<HighlightDescriptor<TDocument>>
@@ -174,7 +174,7 @@ public HighlightDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.HighlighterTagsSchema? TagsSchemaValue { get; set; }
 
-		private string? TypeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.HighlighterType? TypeValue { get; set; }
 
 		public HighlightDescriptor<TDocument> HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery)
 		{
@@ -326,7 +326,7 @@ public HighlightDescriptor<TDocument> TagsSchema(Elastic.Clients.Elasticsearch.H
 			return Self;
 		}
 
-		public HighlightDescriptor<TDocument> Type(string? type)
+		public HighlightDescriptor<TDocument> Type(Elastic.Clients.Elasticsearch.HighlighterType? type)
 		{
 			TypeValue = type;
 			return Self;
@@ -538,7 +538,7 @@ public HighlightDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.HighlighterTagsSchema? TagsSchemaValue { get; set; }
 
-		private string? TypeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.HighlighterType? TypeValue { get; set; }
 
 		public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery)
 		{
@@ -690,7 +690,7 @@ public HighlightDescriptor TagsSchema(Elastic.Clients.Elasticsearch.HighlighterT
 			return Self;
 		}
 
-		public HighlightDescriptor Type(string? type)
+		public HighlightDescriptor Type(Elastic.Clients.Elasticsearch.HighlighterType? type)
 		{
 			TypeValue = type;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/HighlightField.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/HighlightField.g.cs
@@ -116,7 +116,7 @@ public sealed partial class HighlightField
 
 		[JsonInclude]
 		[JsonPropertyName("type")]
-		public string? Type { get; set; }
+		public Elastic.Clients.Elasticsearch.HighlighterType? Type { get; set; }
 	}
 
 	public sealed partial class HighlightFieldDescriptor<TDocument> : SerializableDescriptorBase<HighlightFieldDescriptor<TDocument>>
@@ -174,7 +174,7 @@ public HighlightFieldDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.HighlighterTagsSchema? TagsSchemaValue { get; set; }
 
-		private string? TypeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.HighlighterType? TypeValue { get; set; }
 
 		public HighlightFieldDescriptor<TDocument> HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery)
 		{
@@ -332,7 +332,7 @@ public HighlightFieldDescriptor<TDocument> TagsSchema(Elastic.Clients.Elasticsea
 			return Self;
 		}
 
-		public HighlightFieldDescriptor<TDocument> Type(string? type)
+		public HighlightFieldDescriptor<TDocument> Type(Elastic.Clients.Elasticsearch.HighlighterType? type)
 		{
 			TypeValue = type;
 			return Self;
@@ -548,7 +548,7 @@ public HighlightFieldDescriptor() : base()
 
 		private Elastic.Clients.Elasticsearch.HighlighterTagsSchema? TagsSchemaValue { get; set; }
 
-		private string? TypeValue { get; set; }
+		private Elastic.Clients.Elasticsearch.HighlighterType? TypeValue { get; set; }
 
 		public HighlightFieldDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery)
 		{
@@ -712,7 +712,7 @@ public HighlightFieldDescriptor TagsSchema(Elastic.Clients.Elasticsearch.Highlig
 			return Self;
 		}
 
-		public HighlightFieldDescriptor Type(string? type)
+		public HighlightFieldDescriptor Type(Elastic.Clients.Elasticsearch.HighlighterType? type)
 		{
 			TypeValue = type;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineScript.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/InlineScript.g.cs
@@ -28,7 +28,7 @@ public sealed partial class InlineScript
 	{
 		[JsonInclude]
 		[JsonPropertyName("lang")]
-		public string? Language { get; set; }
+		public Elastic.Clients.Elasticsearch.ScriptLanguage? Language { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("options")]
@@ -50,15 +50,15 @@ public InlineScriptDescriptor() : base()
 		{
 		}
 
-		private string? LanguageValue { get; set; }
+		private Elastic.Clients.Elasticsearch.ScriptLanguage? LanguageValue { get; set; }
 
 		private Dictionary<string, string>? OptionsValue { get; set; }
 
 		private Dictionary<string, object>? ParamsValue { get; set; }
 
 		private string SourceValue { get; set; }
 
-		public InlineScriptDescriptor Language(string? language)
+		public InlineScriptDescriptor Language(Elastic.Clients.Elasticsearch.ScriptLanguage? language)
 		{
 			LanguageValue = language;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/LanguageContext.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/LanguageContext.g.cs
@@ -32,6 +32,6 @@ public sealed partial class LanguageContext
 
 		[JsonInclude]
 		[JsonPropertyName("language")]
-		public string Language { get; init; }
+		public Elastic.Clients.Elasticsearch.ScriptLanguage Language { get; init; }
 	}
 }
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleTemplateInlineScript.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/Security/RoleTemplateInlineScript.g.cs
@@ -28,7 +28,7 @@ public sealed partial class RoleTemplateInlineScript
 	{
 		[JsonInclude]
 		[JsonPropertyName("lang")]
-		public string? Lang { get; set; }
+		public Elastic.Clients.Elasticsearch.ScriptLanguage? Lang { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("options")]
@@ -50,15 +50,15 @@ public RoleTemplateInlineScriptDescriptor() : base()
 		{
 		}
 
-		private string? LangValue { get; set; }
+		private Elastic.Clients.Elasticsearch.ScriptLanguage? LangValue { get; set; }
 
 		private Dictionary<string, string>? OptionsValue { get; set; }
 
 		private Dictionary<string, object>? ParamsValue { get; set; }
 
 		private Union<string, Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer> SourceValue { get; set; }
 
-		public RoleTemplateInlineScriptDescriptor Lang(string? lang)
+		public RoleTemplateInlineScriptDescriptor Lang(Elastic.Clients.Elasticsearch.ScriptLanguage? lang)
 		{
 			LangValue = lang;
 			return Self;
diff --git a/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScript.g.cs b/src/Elastic.Clients.Elasticsearch/_Generated/Types/StoredScript.g.cs
@@ -28,7 +28,7 @@ public sealed partial class StoredScript
 	{
 		[JsonInclude]
 		[JsonPropertyName("lang")]
-		public string Language { get; set; }
+		public Elastic.Clients.Elasticsearch.ScriptLanguage Language { get; set; }
 
 		[JsonInclude]
 		[JsonPropertyName("options")]
@@ -46,13 +46,13 @@ public StoredScriptDescriptor() : base()
 		{
 		}
 
-		private string LanguageValue { get; set; }
+		private Elastic.Clients.Elasticsearch.ScriptLanguage LanguageValue { get; set; }
 
 		private Dictionary<string, string>? OptionsValue { get; set; }
 
 		private string SourceValue { get; set; }
 
-		public StoredScriptDescriptor Language(string language)
+		public StoredScriptDescriptor Language(Elastic.Clients.Elasticsearch.ScriptLanguage language)
 		{
 			LanguageValue = language;
 			return Self;

Original file line number	Diff line number	Diff line change
`@@ -38,19 +38,16 @@ public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
`41`		`-`
`42`		`-internal sealed class EnumStructConverter<T> : JsonConverter<T>`
	`41`	`+internal sealed class EnumStructConverter<T> : JsonConverter<T> where T : new()`
`43`	`42`	`{`
`44`		`- // TODO: Rename if not valid`
`45`		`-`
`46`	`43`	`public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)`
`47`	`44`	`{`
`48`	`45`	`var value = reader.GetString();`
`49`	`46`
`50`	`47`	`var instance = (T)Activator.CreateInstance(`
`51`	`48`	`typeof(T),`
`52`	`49`	`BindingFlags.Instance \| BindingFlags.NonPublic,`
`53`		`- args: new object[] { value },`
	`50`	`+ args: new object[] { value }, // TODO: Perf - Review use of ArrayPool`
`54`	`51`	`binder: null,`
`55`	`52`	`culture: null)!;`
`56`	`53`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public sealed partial class Highlight`
`116`	`116`
`117`	`117`	`[JsonInclude]`
`118`	`118`	`[JsonPropertyName("type")]`
`119`		`- public string? Type { get; set; }`
	`119`	`+ public Elastic.Clients.Elasticsearch.HighlighterType? Type { get; set; }`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`public sealed partial class HighlightDescriptor<TDocument> : SerializableDescriptorBase<HighlightDescriptor<TDocument>>`
`@@ -174,7 +174,7 @@ public HighlightDescriptor() : base()`
`174`	`174`
`175`	`175`	`private Elastic.Clients.Elasticsearch.HighlighterTagsSchema? TagsSchemaValue { get; set; }`
`176`	`176`
`177`		`- private string? TypeValue { get; set; }`
	`177`	`+ private Elastic.Clients.Elasticsearch.HighlighterType? TypeValue { get; set; }`
`178`	`178`
`179`	`179`	`public HighlightDescriptor<TDocument> HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery)`
`180`	`180`	`{`
`@@ -326,7 +326,7 @@ public HighlightDescriptor<TDocument> TagsSchema(Elastic.Clients.Elasticsearch.H`
`326`	`326`	`return Self;`
`327`	`327`	`}`
`328`	`328`
`329`		`- public HighlightDescriptor<TDocument> Type(string? type)`
	`329`	`+ public HighlightDescriptor<TDocument> Type(Elastic.Clients.Elasticsearch.HighlighterType? type)`
`330`	`330`	`{`
`331`	`331`	`TypeValue = type;`
`332`	`332`	`return Self;`
`@@ -538,7 +538,7 @@ public HighlightDescriptor() : base()`
`538`	`538`
`539`	`539`	`private Elastic.Clients.Elasticsearch.HighlighterTagsSchema? TagsSchemaValue { get; set; }`
`540`	`540`
`541`		`- private string? TypeValue { get; set; }`
	`541`	`+ private Elastic.Clients.Elasticsearch.HighlighterType? TypeValue { get; set; }`
`542`	`542`
`543`	`543`	`public HighlightDescriptor HighlightQuery(Elastic.Clients.Elasticsearch.QueryDsl.QueryContainer? highlightQuery)`
`544`	`544`	`{`
`@@ -690,7 +690,7 @@ public HighlightDescriptor TagsSchema(Elastic.Clients.Elasticsearch.HighlighterT`
`690`	`690`	`return Self;`
`691`	`691`	`}`
`692`	`692`
`693`		`- public HighlightDescriptor Type(string? type)`
	`693`	`+ public HighlightDescriptor Type(Elastic.Clients.Elasticsearch.HighlighterType? type)`
`694`	`694`	`{`
`695`	`695`	`TypeValue = type;`
`696`	`696`	`return Self;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public sealed partial class InlineScript`
`28`	`28`	`{`
`29`	`29`	`[JsonInclude]`
`30`	`30`	`[JsonPropertyName("lang")]`
`31`		`- public string? Language { get; set; }`
	`31`	`+ public Elastic.Clients.Elasticsearch.ScriptLanguage? Language { get; set; }`
`32`	`32`
`33`	`33`	`[JsonInclude]`
`34`	`34`	`[JsonPropertyName("options")]`
`@@ -50,15 +50,15 @@ public InlineScriptDescriptor() : base()`
`50`	`50`	`{`
`51`	`51`	`}`
`52`	`52`
`53`		`- private string? LanguageValue { get; set; }`
	`53`	`+ private Elastic.Clients.Elasticsearch.ScriptLanguage? LanguageValue { get; set; }`
`54`	`54`
`55`	`55`	`private Dictionary<string, string>? OptionsValue { get; set; }`
`56`	`56`
`57`	`57`	`private Dictionary<string, object>? ParamsValue { get; set; }`
`58`	`58`
`59`	`59`	`private string SourceValue { get; set; }`
`60`	`60`
`61`		`- public InlineScriptDescriptor Language(string? language)`
	`61`	`+ public InlineScriptDescriptor Language(Elastic.Clients.Elasticsearch.ScriptLanguage? language)`
`62`	`62`	`{`
`63`	`63`	`LanguageValue = language;`
`64`	`64`	`return Self;`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ public sealed partial class LanguageContext`
`32`	`32`
`33`	`33`	`[JsonInclude]`
`34`	`34`	`[JsonPropertyName("language")]`
`35`		`- public string Language { get; init; }`
	`35`	`+ public Elastic.Clients.Elasticsearch.ScriptLanguage Language { get; init; }`
`36`	`36`	`}`
`37`	`37`	`}`