Skip to content

Commit d75f6ba

Browse files
l-trottal-trotta
committed
Merge remote-tracking branch 'origin/8.18-release-notes' into 8.18-release-notes
2 parents c654510 + 46bf01a commit d75f6ba

14 files changed

+222
-1385
lines changed

‎java-client/src/main/java/co/elastic/clients/elasticsearch/cluster/health/HealthResponseBody.java‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import co.elastic.clients.util.WithJsonObjectBuilderBase;
3434
import jakarta.json.stream.JsonGenerator;
3535
import java.lang.Boolean;
36+
import java.lang.Double;
3637
import java.lang.Integer;
3738
import java.lang.Long;
3839
import java.lang.String;
@@ -70,7 +71,10 @@ public abstract class HealthResponseBody implements JsonpSerializable {
7071

7172
private final int activeShards;
7273

73-
private final String activeShardsPercentAsNumber;
74+
@Nullable
75+
private final String activeShardsPercent;
76+
77+
private final double activeShardsPercentAsNumber;
7478

7579
private final String clusterName;
7680

@@ -110,8 +114,9 @@ protected HealthResponseBody(AbstractBuilder<?> builder) {
110114
this.activePrimaryShards = ApiTypeHelper.requireNonNull(builder.activePrimaryShards, this,
111115
"activePrimaryShards", 0);
112116
this.activeShards = ApiTypeHelper.requireNonNull(builder.activeShards, this, "activeShards", 0);
117+
this.activeShardsPercent = builder.activeShardsPercent;
113118
this.activeShardsPercentAsNumber = ApiTypeHelper.requireNonNull(builder.activeShardsPercentAsNumber, this,
114-
"activeShardsPercentAsNumber");
119+
"activeShardsPercentAsNumber", 0);
115120
this.clusterName = ApiTypeHelper.requireNonNull(builder.clusterName, this, "clusterName");
116121
this.delayedUnassignedShards = ApiTypeHelper.requireNonNull(builder.delayedUnassignedShards, this,
117122
"delayedUnassignedShards", 0);
@@ -154,13 +159,24 @@ public final int activeShards() {
154159
return this.activeShards;
155160
}
156161

162+
/**
163+
* The ratio of active shards in the cluster expressed as a string formatted
164+
* percentage.
165+
* <p>
166+
* API name: {@code active_shards_percent}
167+
*/
168+
@Nullable
169+
public final String activeShardsPercent() {
170+
return this.activeShardsPercent;
171+
}
172+
157173
/**
158174
* Required - The ratio of active shards in the cluster expressed as a
159175
* percentage.
160176
* <p>
161177
* API name: {@code active_shards_percent_as_number}
162178
*/
163-
public final String activeShardsPercentAsNumber() {
179+
public final double activeShardsPercentAsNumber() {
164180
return this.activeShardsPercentAsNumber;
165181
}
166182

@@ -317,6 +333,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
317333
generator.writeKey("active_shards");
318334
generator.write(this.activeShards);
319335

336+
if (this.activeShardsPercent != null) {
337+
generator.writeKey("active_shards_percent");
338+
generator.write(this.activeShardsPercent);
339+
340+
}
320341
generator.writeKey("active_shards_percent_as_number");
321342
generator.write(this.activeShardsPercentAsNumber);
322343

@@ -388,7 +409,10 @@ public abstract static class AbstractBuilder<BuilderT extends AbstractBuilder<Bu
388409

389410
private Integer activeShards;
390411

391-
private String activeShardsPercentAsNumber;
412+
@Nullable
413+
private String activeShardsPercent;
414+
415+
private Double activeShardsPercentAsNumber;
392416

393417
private String clusterName;
394418

@@ -442,13 +466,24 @@ public final BuilderT activeShards(int value) {
442466
return self();
443467
}
444468

469+
/**
470+
* The ratio of active shards in the cluster expressed as a string formatted
471+
* percentage.
472+
* <p>
473+
* API name: {@code active_shards_percent}
474+
*/
475+
public final BuilderT activeShardsPercent(@Nullable String value) {
476+
this.activeShardsPercent = value;
477+
return self();
478+
}
479+
445480
/**
446481
* Required - The ratio of active shards in the cluster expressed as a
447482
* percentage.
448483
* <p>
449484
* API name: {@code active_shards_percent_as_number}
450485
*/
451-
public final BuilderT activeShardsPercentAsNumber(String value) {
486+
public final BuilderT activeShardsPercentAsNumber(double value) {
452487
this.activeShardsPercentAsNumber = value;
453488
return self();
454489
}
@@ -644,7 +679,8 @@ protected static <BuilderT extends AbstractBuilder<BuilderT>> void setupHealthRe
644679

645680
op.add(AbstractBuilder::activePrimaryShards, JsonpDeserializer.integerDeserializer(), "active_primary_shards");
646681
op.add(AbstractBuilder::activeShards, JsonpDeserializer.integerDeserializer(), "active_shards");
647-
op.add(AbstractBuilder::activeShardsPercentAsNumber, JsonpDeserializer.stringDeserializer(),
682+
op.add(AbstractBuilder::activeShardsPercent, JsonpDeserializer.stringDeserializer(), "active_shards_percent");
683+
op.add(AbstractBuilder::activeShardsPercentAsNumber, JsonpDeserializer.doubleDeserializer(),
648684
"active_shards_percent_as_number");
649685
op.add(AbstractBuilder::clusterName, JsonpDeserializer.stringDeserializer(), "cluster_name");
650686
op.add(AbstractBuilder::delayedUnassignedShards, JsonpDeserializer.integerDeserializer(),

‎java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html‎

Lines changed: 31 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@
11641164
'cluster.get_component_template.Response': 'cluster/get_component_template/ClusterGetComponentTemplateResponse.ts#L22-L24',
11651165
'cluster.get_settings.Request': 'cluster/get_settings/ClusterGetSettingsRequest.ts#L23-L63',
11661166
'cluster.get_settings.Response': 'cluster/get_settings/ClusterGetSettingsResponse.ts#L23-L29',
1167-
'cluster.health.HealthResponseBody': 'cluster/health/ClusterHealthResponse.ts#L39-L74',
1167+
'cluster.health.HealthResponseBody': 'cluster/health/ClusterHealthResponse.ts#L39-L76',
11681168
'cluster.health.IndexHealthStats': 'cluster/health/types.ts#L24-L35',
11691169
'cluster.health.Request': 'cluster/health/ClusterHealthRequest.ts#L32-L117',
11701170
'cluster.health.Response': 'cluster/health/ClusterHealthResponse.ts#L26-L37',
@@ -1361,8 +1361,6 @@
13611361
'eql.search.Response': 'eql/search/EqlSearchResponse.ts#L22-L24',
13621362
'eql.search.ResultPosition': 'eql/search/types.ts#L20-L32',
13631363
'esql._types.TableValuesContainer': 'esql/_types/TableValuesContainer.ts#L22-L28',
1364-
'esql.async_query_stop.Request': 'esql/async_query_stop/AsyncQueryStopRequest.ts#L23-L50',
1365-
'esql.async_query_stop.Response': 'esql/async_query_stop/AsyncQueryStopResponse.ts#L22-L24',
13661364
'esql.query.EsqlFormat': 'esql/query/QueryParameters.ts#L20-L29',
13671365
'esql.query.Request': 'esql/query/QueryRequest.ts#L27-L105',
13681366
'esql.query.Response': 'esql/query/QueryResponse.ts#L22-L25',
@@ -1754,9 +1752,6 @@
17541752
'inference._types.CompletionToolType': 'inference/_types/CommonTypes.ts#L79-L82',
17551753
'inference._types.ContentObject': 'inference/_types/CommonTypes.ts#L84-L96',
17561754
'inference._types.DeleteInferenceEndpointResult': 'inference/_types/Results.ts#L109-L114',
1757-
'inference._types.EisServiceSettings': 'inference/_types/CommonTypes.ts#L684-L694',
1758-
'inference._types.EisServiceType': 'inference/_types/CommonTypes.ts#L700-L702',
1759-
'inference._types.EisTaskType': 'inference/_types/CommonTypes.ts#L696-L698',
17601755
'inference._types.ElasticsearchServiceSettings': 'inference/_types/CommonTypes.ts#L704-L738',
17611756
'inference._types.ElasticsearchServiceType': 'inference/_types/CommonTypes.ts#L754-L756',
17621757
'inference._types.ElasticsearchTaskSettings': 'inference/_types/CommonTypes.ts#L740-L746',
@@ -1819,8 +1814,6 @@
18191814
'inference.delete.Response': 'inference/delete/DeleteResponse.ts#L22-L24',
18201815
'inference.get.Request': 'inference/get/GetRequest.ts#L24-L56',
18211816
'inference.get.Response': 'inference/get/GetResponse.ts#L22-L26',
1822-
'inference.post_eis_chat_completion.Request': 'inference/post_eis_chat_completion/PostEisChatCompletionRequest.ts#L23-L48',
1823-
'inference.post_eis_chat_completion.Response': 'inference/post_eis_chat_completion/PostEisChatCompletionResponse.ts#L22-L24',
18241817
'inference.put.Request': 'inference/put/PutRequest.ts#L25-L65',
18251818
'inference.put.Response': 'inference/put/PutResponse.ts#L22-L24',
18261819
'inference.put_alibabacloud.Request': 'inference/put_alibabacloud/PutAlibabaCloudRequest.ts#L30-L83',
@@ -1835,8 +1828,6 @@
18351828
'inference.put_azureopenai.Response': 'inference/put_azureopenai/PutAzureOpenAiResponse.ts#L22-L24',
18361829
'inference.put_cohere.Request': 'inference/put_cohere/PutCohereRequest.ts#L30-L84',
18371830
'inference.put_cohere.Response': 'inference/put_cohere/PutCohereResponse.ts#L22-L24',
1838-
'inference.put_eis.Request': 'inference/put_eis/PutEisRequest.ts#L28-L66',
1839-
'inference.put_eis.Response': 'inference/put_eis/PutEisResponse.ts#L22-L24',
18401831
'inference.put_elasticsearch.Request': 'inference/put_elasticsearch/PutElasticsearchRequest.ts#L30-L91',
18411832
'inference.put_elasticsearch.Response': 'inference/put_elasticsearch/PutElasticsearchResponse.ts#L22-L24',
18421833
'inference.put_elser.Request': 'inference/put_elser/PutElserRequest.ts#L29-L86',
@@ -1896,45 +1887,46 @@
18961887
'ingest._types.GrokProcessor': 'ingest/_types/Processors.ts#L950-L981',
18971888
'ingest._types.GsubProcessor': 'ingest/_types/Processors.ts#L983-L1007',
18981889
'ingest._types.HtmlStripProcessor': 'ingest/_types/Processors.ts#L1009-L1025',
1899-
'ingest._types.InferenceConfig': 'ingest/_types/Processors.ts#L1048-L1060',
1900-
'ingest._types.InferenceConfigClassification': 'ingest/_types/Processors.ts#L1075-L1101',
1901-
'ingest._types.InferenceConfigRegression': 'ingest/_types/Processors.ts#L1062-L1073',
1902-
'ingest._types.InferenceProcessor': 'ingest/_types/Processors.ts#L1027-L1046',
1890+
'ingest._types.InferenceConfig': 'ingest/_types/Processors.ts#L1066-L1078',
1891+
'ingest._types.InferenceConfigClassification': 'ingest/_types/Processors.ts#L1093-L1119',
1892+
'ingest._types.InferenceConfigRegression': 'ingest/_types/Processors.ts#L1080-L1091',
1893+
'ingest._types.InferenceProcessor': 'ingest/_types/Processors.ts#L1027-L1059',
19031894
'ingest._types.Ingest': 'ingest/_types/Simulation.ts#L29-L37',
1895+
'ingest._types.InputConfig': 'ingest/_types/Processors.ts#L1061-L1064',
19041896
'ingest._types.IpLocationProcessor': 'ingest/_types/Processors.ts#L478-L512',
19051897
'ingest._types.Ipinfo': 'ingest/_types/Database.ts#L59-L59',
1906-
'ingest._types.JoinProcessor': 'ingest/_types/Processors.ts#L1103-L1118',
1907-
'ingest._types.JsonProcessor': 'ingest/_types/Processors.ts#L1120-L1149',
1908-
'ingest._types.JsonProcessorConflictStrategy': 'ingest/_types/Processors.ts#L1151-L1156',
1909-
'ingest._types.KeyValueProcessor': 'ingest/_types/Processors.ts#L1158-L1210',
1898+
'ingest._types.JoinProcessor': 'ingest/_types/Processors.ts#L1121-L1136',
1899+
'ingest._types.JsonProcessor': 'ingest/_types/Processors.ts#L1138-L1167',
1900+
'ingest._types.JsonProcessorConflictStrategy': 'ingest/_types/Processors.ts#L1169-L1174',
1901+
'ingest._types.KeyValueProcessor': 'ingest/_types/Processors.ts#L1176-L1228',
19101902
'ingest._types.Local': 'ingest/_types/Database.ts#L63-L65',
1911-
'ingest._types.LowercaseProcessor': 'ingest/_types/Processors.ts#L1212-L1228',
1903+
'ingest._types.LowercaseProcessor': 'ingest/_types/Processors.ts#L1230-L1246',
19121904
'ingest._types.Maxmind': 'ingest/_types/Database.ts#L55-L57',
1913-
'ingest._types.NetworkDirectionProcessor': 'ingest/_types/Processors.ts#L1230-L1264',
1905+
'ingest._types.NetworkDirectionProcessor': 'ingest/_types/Processors.ts#L1248-L1282',
19141906
'ingest._types.Pipeline': 'ingest/_types/Pipeline.ts#L23-L51',
19151907
'ingest._types.PipelineConfig': 'ingest/_types/Pipeline.ts#L67-L81',
1916-
'ingest._types.PipelineProcessor': 'ingest/_types/Processors.ts#L1266-L1277',
1908+
'ingest._types.PipelineProcessor': 'ingest/_types/Processors.ts#L1284-L1295',
19171909
'ingest._types.PipelineSimulation': 'ingest/_types/Simulation.ts#L52-L60',
19181910
'ingest._types.ProcessorBase': 'ingest/_types/Processors.ts#L303-L326',
19191911
'ingest._types.ProcessorContainer': 'ingest/_types/Processors.ts#L27-L301',
19201912
'ingest._types.Redact': 'ingest/_types/Simulation.ts#L39-L44',
1921-
'ingest._types.RedactProcessor': 'ingest/_types/Processors.ts#L1279-L1320',
1922-
'ingest._types.RegisteredDomainProcessor': 'ingest/_types/Processors.ts#L1322-L1338',
1923-
'ingest._types.RemoveProcessor': 'ingest/_types/Processors.ts#L1340-L1354',
1924-
'ingest._types.RenameProcessor': 'ingest/_types/Processors.ts#L1356-L1372',
1925-
'ingest._types.RerouteProcessor': 'ingest/_types/Processors.ts#L1374-L1402',
1926-
'ingest._types.ScriptProcessor': 'ingest/_types/Processors.ts#L1404-L1424',
1927-
'ingest._types.SetProcessor': 'ingest/_types/Processors.ts#L1426-L1460',
1928-
'ingest._types.SetSecurityUserProcessor': 'ingest/_types/Processors.ts#L1462-L1471',
1929-
'ingest._types.ShapeType': 'ingest/_types/Processors.ts#L1473-L1476',
1913+
'ingest._types.RedactProcessor': 'ingest/_types/Processors.ts#L1297-L1338',
1914+
'ingest._types.RegisteredDomainProcessor': 'ingest/_types/Processors.ts#L1340-L1356',
1915+
'ingest._types.RemoveProcessor': 'ingest/_types/Processors.ts#L1358-L1372',
1916+
'ingest._types.RenameProcessor': 'ingest/_types/Processors.ts#L1374-L1390',
1917+
'ingest._types.RerouteProcessor': 'ingest/_types/Processors.ts#L1392-L1420',
1918+
'ingest._types.ScriptProcessor': 'ingest/_types/Processors.ts#L1422-L1442',
1919+
'ingest._types.SetProcessor': 'ingest/_types/Processors.ts#L1444-L1478',
1920+
'ingest._types.SetSecurityUserProcessor': 'ingest/_types/Processors.ts#L1480-L1489',
1921+
'ingest._types.ShapeType': 'ingest/_types/Processors.ts#L1491-L1494',
19301922
'ingest._types.SimulateDocumentResult': 'ingest/_types/Simulation.ts#L46-L50',
1931-
'ingest._types.SortProcessor': 'ingest/_types/Processors.ts#L1478-L1494',
1932-
'ingest._types.SplitProcessor': 'ingest/_types/Processors.ts#L1496-L1521',
1933-
'ingest._types.TerminateProcessor': 'ingest/_types/Processors.ts#L1523-L1523',
1934-
'ingest._types.TrimProcessor': 'ingest/_types/Processors.ts#L1525-L1541',
1935-
'ingest._types.UppercaseProcessor': 'ingest/_types/Processors.ts#L1543-L1559',
1936-
'ingest._types.UriPartsProcessor': 'ingest/_types/Processors.ts#L1579-L1605',
1937-
'ingest._types.UrlDecodeProcessor': 'ingest/_types/Processors.ts#L1561-L1577',
1923+
'ingest._types.SortProcessor': 'ingest/_types/Processors.ts#L1496-L1512',
1924+
'ingest._types.SplitProcessor': 'ingest/_types/Processors.ts#L1514-L1539',
1925+
'ingest._types.TerminateProcessor': 'ingest/_types/Processors.ts#L1541-L1541',
1926+
'ingest._types.TrimProcessor': 'ingest/_types/Processors.ts#L1543-L1559',
1927+
'ingest._types.UppercaseProcessor': 'ingest/_types/Processors.ts#L1561-L1577',
1928+
'ingest._types.UriPartsProcessor': 'ingest/_types/Processors.ts#L1597-L1623',
1929+
'ingest._types.UrlDecodeProcessor': 'ingest/_types/Processors.ts#L1579-L1595',
19381930
'ingest._types.UserAgentProcessor': 'ingest/_types/Processors.ts#L514-L545',
19391931
'ingest._types.UserAgentProperty': 'ingest/_types/Processors.ts#L547-L553',
19401932
'ingest._types.Web': 'ingest/_types/Database.ts#L61-L61',
@@ -3200,10 +3192,10 @@
32003192
if (hash.length > 1) {
32013193
hash = hash.substring(1);
32023194
}
3203-
window.location = "https://github.com/elastic/elasticsearch-specification/tree/5581a3c3491093911cb4e1841919cc0e5d4f60f8/specification/" + (paths[hash] || "");
3195+
window.location = "https://github.com/elastic/elasticsearch-specification/tree/485ee665f8e1f71f271b13311fd62cb4f46f2213/specification/" + (paths[hash] || "");
32043196
</script>
32053197
</head>
32063198
<body>
3207-
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/5581a3c3491093911cb4e1841919cc0e5d4f60f8/specification/">Elasticsearch API specification</a>.
3199+
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/485ee665f8e1f71f271b13311fd62cb4f46f2213/specification/">Elasticsearch API specification</a>.
32083200
</body>
32093201
</html>

0 commit comments

Comments
 (0)