Merge branch 'main' of github.com:marciw/elasticsearch-java

Author: marciw

README.md

@@ -42,10 +42,10 @@ is required for that. Elasticsearch language clients are only backwards
 compatible with default distributions and without guarantees made.
 
 | Elasticsearch Version | Elasticsearch-Java Branch | Supported |
-| --------------------- | ------------------------- | --------- |
+|-----------------------|---------------------------|-----------|
 | main                  | main                      |           |
-| 8.x                   | 8.x                       | 8.x       |
-| 7.x                   | 7.x                       | 7.17      |
+| 9.x                   | 9.x                       | 9.x       |
+| 8.x                   | 8.x                       | 8.17      |
 
 ## Usage
 

docs/docset.yml

@@ -1,4 +1,6 @@
 project: 'Java API Client'
+products:
+  - id: elasticsearch-client
 exclude:
   - external-resources.md
   - design/*
@@ -10,6 +12,6 @@ toc:
   - toc: release-notes
 subs:
   es:   "Elasticsearch"
-  version: "9.0.0"
+  version: "9.0.1"
   # Not used by docs-builder, but present in `% :::{include-bloc}` preprocessing directives (see IncludeExpander.java)
   doc-tests-src: "../../java-client/src/test/java/co/elastic/clients/documentation"

docs/reference/breaking-changes-policy.md

@@ -26,7 +26,7 @@ Along with these bug fixes, the API specification is constantly refined, more pr
 
 ## Breaking changes in major releases [_breaking_changes_in_major_releases]
 
-Major releases (e.g. 7.x → 8.x) can include larger refactorings of the API specification and the framework underlying the Java API Client. These refactorings are considered carefully and done only when they unlock new important features or new developments.
+Major releases (e.g. 8.x → 9.x) can include larger refactorings of the API specification and the framework underlying the Java API Client. These refactorings are considered carefully and done only when they unlock new important features or new developments.
 
 
 ## Elasticsearch API stability guarantees [_elasticsearch_api_stability_guarantees]
@@ -35,4 +35,4 @@ All Elasticsearch APIs have stability indicators, which imply potential changes.
 
 ## Breaking changes by release
 
-For more information, refer to the [](../release-notes/index.md).
+For more information, refer to the [](../release-notes/index.md).

docs/reference/javadoc-source-code.md

@@ -5,7 +5,7 @@ mapped_pages:
 
 # Javadoc and source code [java-client-javadoc]
 
-The javadoc for the Java API Client can be found at [https://snapshots.elastic.co/javadoc/co/elastic/clients/elasticsearch-java/{{version}}/](https://snapshots.elastic.co/javadoc/co/elastic/clients/elasticsearch-java/{{version}}/).
+The Javadoc for the Java API Client is available at [https://javadoc.io/doc/co.elastic.clients/elasticsearch-java/](https://javadoc.io/doc/co.elastic.clients/elasticsearch-java/latest/index.html).
 
 The source code is at [https://github.com/elastic/elasticsearch-java/](https://github.com/elastic/elasticsearch-java/) and is licensed under the Apache 2.0 License.
 

java-client/build.gradle.kts

@@ -175,11 +175,9 @@ signing {
 }
 
 dependencies {
-    // Compile and test with the last 8.x version to make sure transition scenarios where
-    // the Java API client coexists with a 8.x HLRC work fine
     val elasticsearchVersion = "9.0.0"
     val jacksonVersion = "2.18.3"
-    val openTelemetryVersion = "1.29.0"
+    val openTelemetryVersion = "1.32.0"
 
     // Apache 2.0
     // https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html
@@ -211,8 +209,7 @@ dependencies {
     // Apache 2.0
     // https://github.com/open-telemetry/opentelemetry-java
     implementation("io.opentelemetry", "opentelemetry-api", openTelemetryVersion)
-    // Use it once it's stable (see Instrumentation.java). Limited to tests for now.
-    testImplementation("io.opentelemetry", "opentelemetry-semconv", "$openTelemetryVersion-alpha")
+    implementation("io.opentelemetry.semconv","opentelemetry-semconv", openTelemetryVersion)
     testImplementation("io.opentelemetry", "opentelemetry-sdk", openTelemetryVersion)
 
     // EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0

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

@@ -26,6 +26,7 @@
 import co.elastic.clients.json.ObjectDeserializer;
 import co.elastic.clients.util.ObjectBuilder;
 import jakarta.json.stream.JsonGenerator;
+import java.lang.String;
 import java.util.Objects;
 import java.util.function.Function;
 import javax.annotation.Nullable;
@@ -61,13 +62,17 @@ public class IcuNormalizationCharFilter extends CharFilterBase implements CharFi
 	@Nullable
 	private final IcuNormalizationType name;
 
+	@Nullable
+	private final String unicodeSetFilter;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private IcuNormalizationCharFilter(Builder builder) {
 		super(builder);
 
 		this.mode = builder.mode;
 		this.name = builder.name;
+		this.unicodeSetFilter = builder.unicodeSetFilter;
 
 	}
 
@@ -99,6 +104,14 @@ public final IcuNormalizationType name() {
 		return this.name;
 	}
 
+	/**
+	 * API name: {@code unicode_set_filter}
+	 */
+	@Nullable
+	public final String unicodeSetFilter() {
+		return this.unicodeSetFilter;
+	}
+
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		generator.write("type", "icu_normalizer");
@@ -111,6 +124,11 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			generator.writeKey("name");
 			this.name.serialize(generator, mapper);
 		}
+		if (this.unicodeSetFilter != null) {
+			generator.writeKey("unicode_set_filter");
+			generator.write(this.unicodeSetFilter);
+
+		}
 
 	}
 
@@ -129,6 +147,9 @@ public static class Builder extends CharFilterBase.AbstractBuilder<Builder>
 		@Nullable
 		private IcuNormalizationType name;
 
+		@Nullable
+		private String unicodeSetFilter;
+
 		/**
 		 * API name: {@code mode}
 		 */
@@ -145,6 +166,14 @@ public final Builder name(@Nullable IcuNormalizationType value) {
 			return this;
 		}
 
+		/**
+		 * API name: {@code unicode_set_filter}
+		 */
+		public final Builder unicodeSetFilter(@Nullable String value) {
+			this.unicodeSetFilter = value;
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -176,6 +205,7 @@ protected static void setupIcuNormalizationCharFilterDeserializer(
 		CharFilterBase.setupCharFilterBaseDeserializer(op);
 		op.add(Builder::mode, IcuNormalizationMode._DESERIALIZER, "mode");
 		op.add(Builder::name, IcuNormalizationType._DESERIALIZER, "name");
+		op.add(Builder::unicodeSetFilter, JsonpDeserializer.stringDeserializer(), "unicode_set_filter");
 
 		op.ignore("type");
 	}

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

@@ -72,12 +72,6 @@ public abstract class RangeQueryBase<T> extends QueryBase {
 	@Nullable
 	private final T lte;
 
-	@Nullable
-	private final T from;
-
-	@Nullable
-	private final T to;
-
 	@Nullable
 	private final JsonpSerializer<T> tSerializer;
 
@@ -91,8 +85,6 @@ protected RangeQueryBase(AbstractBuilder<T, ?> builder) {
 		this.gte = builder.gte;
 		this.lt = builder.lt;
 		this.lte = builder.lte;
-		this.from = builder.from;
-		this.to = builder.to;
 		this.tSerializer = builder.tSerializer;
 
 	}
@@ -147,28 +139,6 @@ public final T lte() {
 		return this.lte;
 	}
 
-	/**
-	 * API name: {@code from}
-	 * 
-	 * @deprecated 8.16.0 Use gte or gt instead
-	 */
-	@Deprecated
-	@Nullable
-	public final T from() {
-		return this.from;
-	}
-
-	/**
-	 * API name: {@code to}
-	 * 
-	 * @deprecated 8.16.0 Use lte or lt instead
-	 */
-	@Deprecated
-	@Nullable
-	public final T to() {
-		return this.to;
-	}
-
 	protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		super.serializeInternal(generator, mapper);
@@ -196,16 +166,6 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 			JsonpUtils.serialize(this.lte, generator, tSerializer, mapper);
 
 		}
-		if (this.from != null) {
-			generator.writeKey("from");
-			JsonpUtils.serialize(this.from, generator, tSerializer, mapper);
-
-		}
-		if (this.to != null) {
-			generator.writeKey("to");
-			JsonpUtils.serialize(this.to, generator, tSerializer, mapper);
-
-		}
 
 	}
 
@@ -227,12 +187,6 @@ public abstract static class AbstractBuilder<T, BuilderT extends AbstractBuilder
 		@Nullable
 		private T lte;
 
-		@Nullable
-		private T from;
-
-		@Nullable
-		private T to;
-
 		@Nullable
 		private JsonpSerializer<T> tSerializer;
 
@@ -286,28 +240,6 @@ public final BuilderT lte(@Nullable T value) {
 			return self();
 		}
 
-		/**
-		 * API name: {@code from}
-		 * 
-		 * @deprecated 8.16.0 Use gte or gt instead
-		 */
-		@Deprecated
-		public final BuilderT from(@Nullable T value) {
-			this.from = value;
-			return self();
-		}
-
-		/**
-		 * API name: {@code to}
-		 * 
-		 * @deprecated 8.16.0 Use lte or lt instead
-		 */
-		@Deprecated
-		public final BuilderT to(@Nullable T value) {
-			this.to = value;
-			return self();
-		}
-
 		/**
 		 * Serializer for T. If not set, an attempt will be made to find a serializer
 		 * from the JSON context.
@@ -328,8 +260,6 @@ protected static <T, BuilderT extends AbstractBuilder<T, BuilderT>> void setupRa
 		op.add(AbstractBuilder::gte, tDeserializer, "gte");
 		op.add(AbstractBuilder::lt, tDeserializer, "lt");
 		op.add(AbstractBuilder::lte, tDeserializer, "lte");
-		op.add(AbstractBuilder::from, tDeserializer, "from");
-		op.add(AbstractBuilder::to, tDeserializer, "to");
 
 	}