Skip to content

Commit

Permalink
fixes-from-pr-2412
Browse files Browse the repository at this point in the history
  • Loading branch information
@l-trotta
l-trotta committed Feb 19, 2024
1 parent a0c99e8 commit 841f350
Show file tree
Hide file tree
Showing 65 changed files with 1,445 additions and 919 deletions.
26 changes: 14 additions & 12 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ public ElasticsearchXpackAsyncClient xpack() {
* request.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/docs-bulk.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docs-bulk.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -370,7 +370,7 @@ public CompletableFuture<BulkResponse> bulk(BulkRequest request) {
* a function that initializes a builder to create the
* {@link BulkRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/docs-bulk.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docs-bulk.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -383,7 +383,7 @@ public final CompletableFuture<BulkResponse> bulk(Function<BulkRequest.Builder,
* request.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/docs-bulk.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docs-bulk.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -398,7 +398,7 @@ public CompletableFuture<BulkResponse> bulk() {
* Explicitly clears the search context for a scroll.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/clear-scroll-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/clear-scroll-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -416,7 +416,7 @@ public CompletableFuture<ClearScrollResponse> clearScroll(ClearScrollRequest req
* a function that initializes a builder to create the
* {@link ClearScrollRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/clear-scroll-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/clear-scroll-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -429,7 +429,7 @@ public final CompletableFuture<ClearScrollResponse> clearScroll(
* Explicitly clears the search context for a scroll.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/clear-scroll-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/clear-scroll-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -444,7 +444,7 @@ public CompletableFuture<ClearScrollResponse> clearScroll() {
* Close a point in time
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -462,7 +462,7 @@ public CompletableFuture<ClosePointInTimeResponse> closePointInTime(ClosePointIn
* a function that initializes a builder to create the
* {@link ClosePointInTimeRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand Down Expand Up @@ -1500,7 +1500,7 @@ public CompletableFuture<MtermvectorsResponse> mtermvectors() {
* Open a point in time that can be used in subsequent searches
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -1518,7 +1518,7 @@ public CompletableFuture<OpenPointInTimeResponse> openPointInTime(OpenPointInTim
* a function that initializes a builder to create the
* {@link OpenPointInTimeRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand Down Expand Up @@ -2238,7 +2238,8 @@ public final <TDocument, TPartialDocument> CompletableFuture<UpdateResponse<TDoc
// ----- Endpoint: update_by_query

/**
* Performs an update on every document in the index without changing the
* Updates documents that match the specified query. If no query is specified,
* performs an update on every document in the index without changing the
* source, for example to pick up a mapping change.
*
* @see <a href=
Expand All @@ -2254,7 +2255,8 @@ public CompletableFuture<UpdateByQueryResponse> updateByQuery(UpdateByQueryReque
}

/**
* Performs an update on every document in the index without changing the
* Updates documents that match the specified query. If no query is specified,
* performs an update on every document in the index without changing the
* source, for example to pick up a mapping change.
*
* @param fn
Expand Down
26 changes: 14 additions & 12 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ public ElasticsearchXpackClient xpack() {
* request.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/docs-bulk.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docs-bulk.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -371,7 +371,7 @@ public BulkResponse bulk(BulkRequest request) throws IOException, ElasticsearchE
* a function that initializes a builder to create the
* {@link BulkRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/docs-bulk.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docs-bulk.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -385,7 +385,7 @@ public final BulkResponse bulk(Function<BulkRequest.Builder, ObjectBuilder<BulkR
* request.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/docs-bulk.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/docs-bulk.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -400,7 +400,7 @@ public BulkResponse bulk() throws IOException, ElasticsearchException {
* Explicitly clears the search context for a scroll.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/clear-scroll-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/clear-scroll-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -418,7 +418,7 @@ public ClearScrollResponse clearScroll(ClearScrollRequest request) throws IOExce
* a function that initializes a builder to create the
* {@link ClearScrollRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/clear-scroll-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/clear-scroll-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -432,7 +432,7 @@ public final ClearScrollResponse clearScroll(
* Explicitly clears the search context for a scroll.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/clear-scroll-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/clear-scroll-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -447,7 +447,7 @@ public ClearScrollResponse clearScroll() throws IOException, ElasticsearchExcept
* Close a point in time
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -466,7 +466,7 @@ public ClosePointInTimeResponse closePointInTime(ClosePointInTimeRequest request
* a function that initializes a builder to create the
* {@link ClosePointInTimeRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand Down Expand Up @@ -1526,7 +1526,7 @@ public MtermvectorsResponse mtermvectors() throws IOException, ElasticsearchExce
* Open a point in time that can be used in subsequent searches
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand All @@ -1545,7 +1545,7 @@ public OpenPointInTimeResponse openPointInTime(OpenPointInTimeRequest request)
* a function that initializes a builder to create the
* {@link OpenPointInTimeRequest}
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/point-in-time-api.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/point-in-time-api.html">Documentation
* on elastic.co</a>
*/

Expand Down Expand Up @@ -2283,7 +2283,8 @@ public final <TDocument, TPartialDocument> UpdateResponse<TDocument> update(
// ----- Endpoint: update_by_query

/**
* Performs an update on every document in the index without changing the
* Updates documents that match the specified query. If no query is specified,
* performs an update on every document in the index without changing the
* source, for example to pick up a mapping change.
*
* @see <a href=
Expand All @@ -2300,7 +2301,8 @@ public UpdateByQueryResponse updateByQuery(UpdateByQueryRequest request)
}

/**
* Performs an update on every document in the index without changing the
* Updates documents that match the specified query. If no query is specified,
* performs an update on every document in the index without changing the
* source, for example to pick up a mapping change.
*
* @param fn
Expand Down
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/elasticsearch/_types/SortOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
/**
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/sort-search-results.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/sort-search-results.html">Documentation
* on elastic.co</a>
* @see <a href="../doc-files/api-spec.html#_types.SortOptions">API
* specification</a>
Expand Down
10 changes: 1 addition & 9 deletions java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/IcuTokenizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
* specification</a>
*/
@JsonpDeserializable
public class IcuTokenizer extends TokenizerBase implements TokenizerDefinitionVariant, TokenFilterDefinitionVariant {
public class IcuTokenizer extends TokenizerBase implements TokenizerDefinitionVariant {
private final String ruleFiles;

// ---------------------------------------------------------------------------------------------
Expand All @@ -79,14 +79,6 @@ public TokenizerDefinition.Kind _tokenizerDefinitionKind() {
return TokenizerDefinition.Kind.IcuTokenizer;
}

/**
* TokenFilterDefinition variant kind.
*/
@Override
public TokenFilterDefinition.Kind _tokenFilterDefinitionKind() {
return TokenFilterDefinition.Kind.IcuTokenizer;
}

/**
* Required - API name: {@code rule_files}
*/
Expand Down
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/elasticsearch/_types/analysis/Normalizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
/**
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/analysis-normalizers.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/analysis-normalizers.html">Documentation
* on elastic.co</a>
* @see <a href="../../doc-files/api-spec.html#_types.analysis.Normalizer">API
* specification</a>
Expand Down
31 changes: 0 additions & 31 deletions ...src/main/java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilterDefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ public enum Kind implements JsonEnum {

IcuNormalizer("icu_normalizer"),

IcuTokenizer("icu_tokenizer"),

IcuTransform("icu_transform"),

Kstem("kstem"),
Expand Down Expand Up @@ -454,23 +452,6 @@ public IcuNormalizationTokenFilter icuNormalizer() {
return TaggedUnionUtils.get(this, Kind.IcuNormalizer);
}

/**
* Is this variant instance of kind {@code icu_tokenizer}?
*/
public boolean isIcuTokenizer() {
return _kind == Kind.IcuTokenizer;
}

/**
* Get the {@code icu_tokenizer} variant value.
*
* @throws IllegalStateException
* if the current variant is not of the {@code icu_tokenizer} kind.
*/
public IcuTokenizer icuTokenizer() {
return TaggedUnionUtils.get(this, Kind.IcuTokenizer);
}

/**
* Is this variant instance of kind {@code icu_transform}?
*/
Expand Down Expand Up @@ -1254,17 +1235,6 @@ public ObjectBuilder<TokenFilterDefinition> icuNormalizer(
return this.icuNormalizer(fn.apply(new IcuNormalizationTokenFilter.Builder()).build());
}

public ObjectBuilder<TokenFilterDefinition> icuTokenizer(IcuTokenizer v) {
this._kind = Kind.IcuTokenizer;
this._value = v;
return this;
}

public ObjectBuilder<TokenFilterDefinition> icuTokenizer(
Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
return this.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
}

public ObjectBuilder<TokenFilterDefinition> icuTransform(IcuTransformTokenFilter v) {
this._kind = Kind.IcuTransform;
this._value = v;
Expand Down Expand Up @@ -1679,7 +1649,6 @@ protected static void setupTokenFilterDefinitionDeserializer(ObjectDeserializer<
op.add(Builder::icuCollation, IcuCollationTokenFilter._DESERIALIZER, "icu_collation");
op.add(Builder::icuFolding, IcuFoldingTokenFilter._DESERIALIZER, "icu_folding");
op.add(Builder::icuNormalizer, IcuNormalizationTokenFilter._DESERIALIZER, "icu_normalizer");
op.add(Builder::icuTokenizer, IcuTokenizer._DESERIALIZER, "icu_tokenizer");
op.add(Builder::icuTransform, IcuTransformTokenFilter._DESERIALIZER, "icu_transform");
op.add(Builder::kstem, KStemTokenFilter._DESERIALIZER, "kstem");
op.add(Builder::keepTypes, KeepTypesTokenFilter._DESERIALIZER, "keep_types");
Expand Down
18 changes: 0 additions & 18 deletions .../java/co/elastic/clients/elasticsearch/_types/analysis/TokenFilterDefinitionBuilders.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,24 +293,6 @@ public static TokenFilterDefinition icuNormalizer(
return builder.build();
}

/**
* Creates a builder for the {@link IcuTokenizer icu_tokenizer}
* {@code TokenFilterDefinition} variant.
*/
public static IcuTokenizer.Builder icuTokenizer() {
return new IcuTokenizer.Builder();
}

/**
* Creates a TokenFilterDefinition of the {@link IcuTokenizer icu_tokenizer}
* {@code TokenFilterDefinition} variant.
*/
public static TokenFilterDefinition icuTokenizer(Function<IcuTokenizer.Builder, ObjectBuilder<IcuTokenizer>> fn) {
TokenFilterDefinition.Builder builder = new TokenFilterDefinition.Builder();
builder.icuTokenizer(fn.apply(new IcuTokenizer.Builder()).build());
return builder.build();
}

/**
* Creates a builder for the {@link IcuTransformTokenFilter icu_transform}
* {@code TokenFilterDefinition} variant.
Expand Down
2 changes: 1 addition & 1 deletion ...lient/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/GeoShapeProperty.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* searching with arbitrary geo shapes such as rectangles and polygons.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/geo-shape.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/geo-shape.html">Documentation
* on elastic.co</a>
* @see <a href=
* "../../doc-files/api-spec.html#_types.mapping.GeoShapeProperty">API
Expand Down
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/elasticsearch/_types/mapping/ShapeProperty.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* polygons.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/shape.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/shape.html">Documentation
* on elastic.co</a>
* @see <a href="../../doc-files/api-spec.html#_types.mapping.ShapeProperty">API
* specification</a>
Expand Down
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Like.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
* the text.
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/query-dsl-mlt-query.html#_document_input_parameters">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/query-dsl-mlt-query.html#_document_input_parameters">Documentation
* on elastic.co</a>
* @see <a href="../../doc-files/api-spec.html#_types.query_dsl.Like">API
* specification</a>
Expand Down
2 changes: 1 addition & 1 deletion java-client/src/main/java/co/elastic/clients/elasticsearch/_types/query_dsl/Query.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
/**
*
* @see <a href=
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.13/query-dsl.html">Documentation
* "https://www.elastic.co/guide/en/elasticsearch/reference/8.14/query-dsl.html">Documentation
* on elastic.co</a>
* @see <a href=
* "../../doc-files/api-spec.html#_types.query_dsl.QueryContainer">API
Expand Down
Loading

0 comments on commit 841f350

Please sign in to comment.