Merge remote-tracking branch 'origin/fix-H1s-per-seo-suggestions' into fix-H1s-per-seo-suggestions

Author: ketkee-aryamane

docs/reference/transport/rest-client/config/basic_authentication.md

@@ -4,7 +4,7 @@ mapped_pages:
 navigation_title: Basic authentication
 ---
 
-# Basic authentication setup for {{es}} Java REST client [_basic_authentication]
+# Basic authentication setup for the {{es}} Java REST client [_basic_authentication]
 
 :::{include} /reference/_snippets/legacy-rest-client.md
 :::

docs/reference/transport/rest-client/config/encrypted_communication.md

@@ -4,7 +4,7 @@ mapped_pages:
 navigation_title: Encrypted communication
 ---
 
-# Encrypted communication and TLS setup in Java REST client [_encrypted_communication]
+# Encrypted communication and TLS setup in the {{es}} Java REST client [_encrypted_communication]
 
 :::{include} /reference/_snippets/legacy-rest-client.md
 :::

docs/reference/transport/rest-client/config/node_selector.md

@@ -4,7 +4,7 @@ mapped_pages:
 navigation_title: Node selector
 ---
 
-# Configuring node selector in the {{es}} Java REST client [_node_selector]
+# Configuring node selectors in the {{es}} Java REST client [_node_selector]
 
 :::{include} /reference/_snippets/legacy-rest-client.md
 :::

docs/reference/transport/rest5-client/config/encrypted_communication.md

@@ -4,7 +4,7 @@ mapped_pages:
 navigation_title: Encrypted communication
 ---
 
-# Encrypted communication and TLS setup in Java REST 5 client
+# Encrypted communication and TLS setup in the {{es}} Java REST 5 client
 
 Encrypted communication using TLS can also be configured through the `HttpClientConfigCallback`. The [`org.apache.http.impl.nio.client.HttpAsyncClientBuilder`](https://hc.apache.org/httpcomponents-asyncclient-4.1.x/current/httpasyncclient/apidocs/org/apache/http/impl/nio/client/HttpAsyncClientBuilder.html) received as an argument exposes multiple methods to configure encrypted communication: `setSSLContext`, `setSSLSessionStrategy` and `setConnectionManager`, in order of precedence from the least important.
 

docs/reference/transport/rest5-client/config/node_selector.md

@@ -4,7 +4,7 @@ mapped_pages:
 navigation_title: Node selector
 ---
 
-# Configuring node selector in the {{es}} Java REST 5 client
+# Configuring node selectors in the {{es}} Java REST 5 client
 
 The client sends each request to one of the configured nodes in round-robin fashion. Nodes can optionally be filtered through a node selector that needs to be provided when initializing the client. This is useful when sniffing is enabled, in case no dedicated master nodes should be hit by HTTP requests. For each request the client will run the eventually configured node selector to filter the node candidates, then select the next one in the list out of the remaining ones.
 

java-client/src/main/java/co/elastic/clients/elasticsearch/_types/SortOptions.java

@@ -302,48 +302,57 @@ public SortOptions build() {
 			return new SortOptions(this);
 		}
 
+		@Override
+		public Builder withJson(JsonParser parser, JsonpMapper mapper) {
+			deserializeBuilder(this, parser.next(), parser, mapper);
+			return this;
+		}
 	}
 
 	public static final JsonpDeserializer<SortOptions> _DESERIALIZER = JsonpDeserializer.lazy(() -> JsonpDeserializer
 			.of(EnumSet.of(JsonParser.Event.START_OBJECT, JsonParser.Event.VALUE_STRING), (parser, mapper, event) -> {
 				SortOptions.Builder b = new SortOptions.Builder();
-
-				if (event == JsonParser.Event.VALUE_STRING) {
-					switch (parser.getString()) {
-						case "_score" :
-							b.score(s -> s);
-							break;
-						case "_doc" :
-							b.doc(d -> d);
-							break;
-						default :
-							b.field(f -> f.field(parser.getString()));
-					}
-					return b.build();
-				}
-
-				JsonpUtils.expectEvent(parser, JsonParser.Event.START_OBJECT, event);
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.KEY_NAME);
-				switch (parser.getString()) {
-					case "_score" :
-						b.score(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					case "_doc" :
-						b.doc(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					case "_geo_distance" :
-						b.geoDistance(GeoDistanceSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					case "_script" :
-						b.script(ScriptSort._DESERIALIZER.deserialize(parser, mapper));
-						break;
-					default :
-						// Consumes END_OBJECT
-						return b.field(FieldSort._DESERIALIZER.deserialize(parser, mapper, JsonParser.Event.KEY_NAME))
-								.build();
-				}
-
-				JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
+				deserializeBuilder(b, event, parser, mapper);
 				return b.build();
 			}));
+
+	private static void deserializeBuilder(SortOptions.Builder b, JsonParser.Event event, JsonParser parser,
+			JsonpMapper mapper) {
+		if (event == JsonParser.Event.VALUE_STRING) {
+			switch (parser.getString()) {
+				case "_score" :
+					b.score(s -> s);
+					break;
+				case "_doc" :
+					b.doc(d -> d);
+					break;
+				default :
+					b.field(f -> f.field(parser.getString()));
+			}
+			return;
+		}
+
+		JsonpUtils.expectEvent(parser, JsonParser.Event.START_OBJECT, event);
+		JsonpUtils.expectNextEvent(parser, JsonParser.Event.KEY_NAME);
+		switch (parser.getString()) {
+			case "_score" :
+				b.score(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
+				break;
+			case "_doc" :
+				b.doc(ScoreSort._DESERIALIZER.deserialize(parser, mapper));
+				break;
+			case "_geo_distance" :
+				b.geoDistance(GeoDistanceSort._DESERIALIZER.deserialize(parser, mapper));
+				break;
+			case "_script" :
+				b.script(ScriptSort._DESERIALIZER.deserialize(parser, mapper));
+				break;
+			default :
+				// Consumes END_OBJECT
+				b.field(FieldSort._DESERIALIZER.deserialize(parser, mapper, JsonParser.Event.KEY_NAME));
+				return;
+		}
+
+		JsonpUtils.expectNextEvent(parser, JsonParser.Event.END_OBJECT);
+	}
 }

java-client/src/test/java/co/elastic/clients/elasticsearch/model/SerializationTest.java

@@ -19,6 +19,7 @@
 
 package co.elastic.clients.elasticsearch.model;
 
+import co.elastic.clients.elasticsearch._types.SortOptions;
 import co.elastic.clients.elasticsearch.cat.NodesResponse;
 import co.elastic.clients.elasticsearch.core.GetSourceResponse;
 import co.elastic.clients.json.JsonpDeserializable;
@@ -131,4 +132,38 @@ public void testJsonpValuesToString() {
             JsonpUtils.toString(Json.createObjectBuilder().build());
         });
     }
+
+    @Test
+    public void testSortOptionsDeserializer() {
+
+        String customField = """
+                {
+                   "term" : "asc"
+                }
+                """;
+
+        SortOptions so = SortOptions.of(b->b.withJson(new StringReader(customField)));
+
+        String score = """
+                   "_score"
+                """;
+
+        so = SortOptions.of(b->b.withJson(new StringReader(score)));
+
+        String geoDistance = """
+                {
+                  "_geo_distance" : {
+                      "pin.location" : "<-70>, <40>",
+                      "order" : "asc",
+                      "unit" : "km",
+                      "mode" : "min",
+                      "distance_type" : "arc",
+                      "ignore_unmapped": true
+                  }
+                }
+            """;
+
+        so = SortOptions.of(b->b.withJson(new StringReader(geoDistance)));
+
+    }
 }