Fix union serialization (#8146)

elastic · Apr 18, 2024 · ad39b22 · ad39b22
1 parent c51fdac
commit ad39b22
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/Elastic.Clients.Elasticsearch.Shared/Serialization/UnionConverter.cs b/src/Elastic.Clients.Elasticsearch.Shared/Serialization/UnionConverter.cs
@@ -130,16 +130,15 @@ private class DerivedUnionConverterInner<TType, TItem1, TItem2> : JsonConverter<
 		public override void Write(Utf8JsonWriter writer, TType value,
 			JsonSerializerOptions options)
 		{
-			if (value.Item1 is not null)
+			switch (value.Tag)
 			{
-				JsonSerializer.Serialize(writer, value.Item1, value.Item1.GetType(), options);
-				return;
-			}
+				case 0:
+					JsonSerializer.Serialize(writer, value.Item1, value.Item1!.GetType(), options);
+					return;
 
-			if (value.Item2 is not null)
-			{
-				JsonSerializer.Serialize(writer, value.Item2, value.Item2.GetType(), options);
-				return;
+				case 1:
+					JsonSerializer.Serialize(writer, value.Item2, value.Item2!.GetType(), options);
+					return;
 			}
 
 			throw new JsonException("Invalid union type.");
@@ -196,16 +195,15 @@ private class UnionConverterInner<TItem1, TItem2> : JsonConverter<Union<TItem1,
 		public override void Write(Utf8JsonWriter writer, Union<TItem1, TItem2> value,
 			JsonSerializerOptions options)
 		{
-			if (value.Item1 is not null)
+			switch (value.Tag)
 			{
-				JsonSerializer.Serialize(writer, value.Item1, value.Item1.GetType(), options);
-				return;
-			}
+				case 0:
+					JsonSerializer.Serialize(writer, value.Item1, value.Item1!.GetType(), options);
+					return;
 
-			if (value.Item2 is not null)
-			{
-				JsonSerializer.Serialize(writer, value.Item2, value.Item2.GetType(), options);
-				return;
+				case 1:
+					JsonSerializer.Serialize(writer, value.Item2, value.Item2!.GetType(), options);
+					return;
 			}
 
 			throw new JsonException("Invalid union type");