Complete JoinFieldConverter (#6396) (#6397)

* Complete JoinFieldConverter

* Fix license headers

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

Author: github-actions[bot]

src/Elastic.Clients.Elasticsearch/Client/ElasticsearchClient-Manual.cs

@@ -17,6 +17,12 @@ public IndexResponse Index<TDocument>(TDocument document, Action<IndexRequestDes
 			return DoRequest<IndexRequestDescriptor<TDocument>, IndexResponse>(descriptor);
 		}
 
+		public IndexResponse Index<TDocument>(TDocument document)
+		{
+			var descriptor = new IndexRequestDescriptor<TDocument>(documentWithId: document);
+			return DoRequest<IndexRequestDescriptor<TDocument>, IndexResponse>(descriptor);
+		}
+
 		public Task<IndexResponse> IndexAsync<TDocument>(TDocument document, CancellationToken cancellationToken = default)
 		{
 			var descriptor = new IndexRequestDescriptor<TDocument>(documentWithId: document);

src/Elastic.Clients.Elasticsearch/Common/Infer/JoinFieldConverter.cs

@@ -5,22 +5,77 @@
 using System;
 using System.Text.Json.Serialization;
 using System.Text.Json;
+using Elastic.Transport;
 
 namespace Elastic.Clients.Elasticsearch
 {
 	internal sealed class JoinFieldConverter : JsonConverter<JoinField>
 	{
-		public override JoinField? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => throw new NotImplementedException();
+		private readonly IElasticsearchClientSettings _elasticsearchClientSettings;
+
+		public JoinFieldConverter(IElasticsearchClientSettings elasticsearchClientSettings) => _elasticsearchClientSettings = elasticsearchClientSettings;
+
+		public override JoinField? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+		{
+			if (reader.TokenType == JsonTokenType.String)
+			{
+				var parent = reader.GetString();
+				return new JoinField(new JoinField.Parent(parent));
+			}
+
+			Id parentId = null;
+			string name = null;
+
+			while (reader.Read() && reader.TokenType != JsonTokenType.EndObject)
+			{
+				if (reader.TokenType != JsonTokenType.PropertyName)
+					throw new JsonException($"Unexpected token. Expected {JsonTokenType.PropertyName}, but read {reader.TokenType}.");
+
+				var propertyName = reader.GetString();
+				reader.Read();
+
+				switch (propertyName)
+				{
+					case "parent":
+						parentId = JsonSerializer.Deserialize<Id>(ref reader, options);
+						break;
+					case "name":
+						name = reader.GetString();
+						break;
+					default:
+						throw new JsonException($"Read an unexpected property name {propertyName}.");
+				}
+			}
+
+			return parentId != null
+				? new JoinField(new JoinField.Child(name, parentId))
+				: new JoinField(new JoinField.Parent(name));
+		}
+
 		public override void Write(Utf8JsonWriter writer, JoinField value, JsonSerializerOptions options)
 		{
+			if (value is null)
+			{
+				writer.WriteNullValue();
+				return;
+			}
+
 			switch (value.Tag)
 			{
 				case 0:
 					JsonSerializer.Serialize(writer, value.ParentOption.Name, options);
-					break; 
-			}
+					break;
 
-			// TODO - Finish this
+				case 1:
+					writer.WriteStartObject();
+					writer.WritePropertyName("name");
+					JsonSerializer.Serialize(writer, value.ChildOption.Name, options);
+					writer.WritePropertyName("parent");
+					var id = (value.ChildOption.ParentId as IUrlParameter)?.GetString(_elasticsearchClientSettings);
+					writer.WriteStringValue(id);
+					writer.WriteEndObject();
+					break;
+			}
 		}
 	}
 }

src/Elastic.Clients.Elasticsearch/Serialization/DefaultRequestResponseSerializer.cs

@@ -48,6 +48,7 @@ public DefaultRequestResponseSerializer(IElasticsearchClientSettings settings)
 					new SortCollectionConverter(settings),
 					new LazyDocumentConverter(settings),
 					new RelationNameConverter(settings),
+					new JoinFieldConverter(settings),
 					new CustomJsonWriterConverterFactory(settings),
 					new RoutingConverter(settings),
 					new SelfSerializableConverterFactory(settings),

src/Elastic.Clients.Elasticsearch/Serialization/DefaultSourceSerializer.cs

@@ -21,6 +21,7 @@ public DefaultSourceSerializer(IElasticsearchClientSettings settings, JsonSerial
 					new IdConverter(settings),
 					new RelationNameConverter(settings),
 					new RoutingConverter(settings),
+					new JoinFieldConverter(settings),
 					new LazyDocumentConverter(settings),
 			},
 			PropertyNamingPolicy = JsonNamingPolicy.CamelCase

src/Elastic.Clients.Elasticsearch/Types/Mapping/Properties.cs

@@ -18,3 +18,9 @@ public bool TryGetProperty<T>(PropertyName propertyName, out T property) where T
 		return false;
 	}
 }
+
+public partial class TypeMappingDescriptor
+{
+	
+}
+

src/PlaygroundV7x/Person.cs

@@ -2,13 +2,26 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information.
 
+using System;
+using Nest;
+
 namespace PlaygroundV7x
 {
 	public class Person
 	{
+		public int Id { get; set; }
+
+		public Guid SecondaryId { get; set; } = Guid.NewGuid();
 		public string? FirstName { get; init; }
 		public string? LastName { get; init; }
 		public int? Age { get; init; }
+		//public Routing? Routing { get; init; }
+
+		public Id Idv3 => "testing";
+		//public Guid Routing { get; init; } = Guid.NewGuid();
+
 		public string? Email { get; init; }
+
+		public string Data { get; init; } = "NOTHING";
 	}
 }

src/PlaygroundV7x/Program.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Elasticsearch.Net;
 using Nest;
 
 namespace PlaygroundV7x
@@ -36,7 +37,20 @@ private static async Task Main()
 				})
 			};
 
-			var client = new ElasticClient();
+			var client = new ElasticClient(new ConnectionSettings(new InMemoryConnection())
+				.DefaultIndex("default-index")
+				.DefaultMappingFor<Person>(m => m
+					.DisableIdInference()
+					.IndexName("people")
+					.IdProperty(id => id.SecondaryId)
+					.RoutingProperty(id => id.SecondaryId)
+					.RelationName("relation"))
+				//.DefaultFieldNameInferrer(s => $"{s}_2")
+				.EnableDebugMode());
+
+			var person = new Person { Id = 101, FirstName = "Steve", LastName = "Gordon", Age = 37, Email = "[email protected]" };
+
+			var routingResponse = await client.IndexAsync(person, r => r);
 
 			client.Update<Person>("a", d => d.Index("test").Script(s => s.Source("script").Params(new Dictionary<string, object?> { { "null", new Person { FirstName = null, LastName = "test-surname" } } })));
 

tests/Tests.Configuration/tests.default.yaml

@@ -17,7 +17,7 @@ force_reseed: true
 # this is opt in during development in CI we never want to see our tests running against an already running node
 test_against_already_running_elasticsearch: true
 
-#random_source_serializer: true
+random_source_serializer: false
 #random_old_transportClient: true
 #random_http_compresssion: true
 #seed: 74337