diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 2961130bdf..9308fb7078 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -24,6 +24,7 @@ jobs: - { opensearch_version: 2.8.0, java: 11 } - { opensearch_version: 2.9.0, java: 11 } - { opensearch_version: 2.10.0, java: 11 } + - { opensearch_version: 2.11.1, java: 11 } steps: - name: Checkout Java Client uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 299843a722..00bbe2ceec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Dependencies - Bumps `io.github.classgraph:classgraph` from 4.8.163 to 4.8.165 - Bumps `org.owasp.dependencycheck` from 8.4.2 to 9.0.8 -- Bumps `com.diffplug.spotless` from 6.22.0 to 6.23.3 +- Bumps `com.diffplug.spotless` from 6.22.0 to 6.24.0 - Bumps `org.apache.httpcomponents.core5:httpcore5-h2` from 5.2.3 to 5.2.4 - Bumps `org.apache.httpcomponents.client5:httpclient5` from 5.2.1 to 5.3 - Bumps `org.apache.httpcomponents.core5:httpcore5` from 5.2.3 to 5.2.4 @@ -54,9 +54,10 @@ This section is for maintaining a changelog for all breaking changes for the cli - Add an integration test that runs on JDK-8 ([#795](https://github.com/opensearch-project/opensearch-java/pull/795)) ### Deprecated -- Deprecated "_toQuery()" in Query and QueryVariant ([#760](https://github.com/opensearch-project/opensearch-java/pull/760) +- Deprecated "_toQuery()" in Query and QueryVariant ([#760](https://github.com/opensearch-project/opensearch-java/pull/760)) ### Removed +- Removed unsupported `prefix` field from CompletionSuggester ([#812](https://github.com/opensearch-project/opensearch-java/pull/812)) ### Fixed - Fix partial success results for msearch_template ([#709](https://github.com/opensearch-project/opensearch-java/pull/709)) diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index bdab6cc899..c1b6fca51d 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -9,7 +9,7 @@ The below matrix shows the compatibility of the [`opensearch-java-client`](https | Client Version | OpenSearch Version | |----------------|--------------------| | 1.0.0 | 1.x | -| 2.x.0 | 1.3.13-2.10.0 | +| 2.x.0 | 1.3.13-2.x.x | ## Compatibility with JDK diff --git a/java-client/build.gradle.kts b/java-client/build.gradle.kts index d0b6065e2b..b63d957b4f 100644 --- a/java-client/build.gradle.kts +++ b/java-client/build.gradle.kts @@ -53,7 +53,7 @@ plugins { `maven-publish` id("com.github.jk1.dependency-license-report") version "2.5" id("org.owasp.dependencycheck") version "9.0.8" - id("com.diffplug.spotless") version "6.23.3" + id("com.diffplug.spotless") version "6.24.0" } apply(plugin = "opensearch.repositories") apply(plugin = "org.owasp.dependencycheck") diff --git a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java index 42a7ba1280..8bba13b7f9 100644 --- a/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java +++ b/java-client/src/main/java/org/opensearch/client/opensearch/core/search/CompletionSuggester.java @@ -54,9 +54,6 @@ public class CompletionSuggester extends SuggesterBase implements FieldSuggester @Nullable private final SuggestFuzziness fuzzy; - @Nullable - private final String prefix; - @Nullable private final String regex; @@ -70,7 +67,6 @@ private CompletionSuggester(Builder builder) { this.contexts = ApiTypeHelper.unmodifiable(builder.contexts); this.fuzzy = builder.fuzzy; - this.prefix = builder.prefix; this.regex = builder.regex; this.skipDuplicates = builder.skipDuplicates; @@ -103,14 +99,6 @@ public final SuggestFuzziness fuzzy() { return this.fuzzy; } - /** - * API name: {@code prefix} - */ - @Nullable - public final String prefix() { - return this.prefix; - } - /** * API name: {@code regex} */ @@ -152,11 +140,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) { generator.writeKey("fuzzy"); this.fuzzy.serialize(generator, mapper); - } - if (this.prefix != null) { - generator.writeKey("prefix"); - generator.write(this.prefix); - } if (this.regex != null) { generator.writeKey("regex"); @@ -184,9 +167,6 @@ public static class Builder extends SuggesterBase.AbstractBuilder imple @Nullable private SuggestFuzziness fuzzy; - @Nullable - private String prefix; - @Nullable private String regex; @@ -228,14 +208,6 @@ public final Builder fuzzy(Function