Merge branch 'main' into mw-serverless-cleanup

Author: l-trotta

example-transports/src/test/java/co/elastic/clients/transport/rest_client/RestTransportClientTest.java

@@ -20,20 +20,21 @@
 package co.elastic.clients.transport.rest_client;
 
 import co.elastic.clients.transport.TransportHttpClientTest;
+import co.elastic.clients.transport.rest5_client.Rest5ClientHttpClient;
 import org.apache.http.HttpHost;
 import org.elasticsearch.client.RestClient;
 
-public class RestTransportClientTest extends TransportHttpClientTest<RestClientHttpClient> {
+public class RestTransportClientTest extends TransportHttpClientTest<Rest5ClientHttpClient> {
 
     public RestTransportClientTest() {
         super(createClient());
     }
 
-    private static RestClientHttpClient createClient() {
+    private static Rest5ClientHttpClient createClient() {
         RestClient restClient = RestClient.builder(
             new HttpHost(server.getAddress().getAddress(), server.getAddress().getPort(), "http")
         ).build();
 
-        return new RestClientHttpClient(restClient);
+        return new Rest5ClientHttpClient(restClient);
     }
 }

java-client/build.gradle.kts

@@ -38,8 +38,8 @@ checkstyle {
 }
 
 java {
-    targetCompatibility = JavaVersion.VERSION_1_8
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_17
 
     withJavadocJar()
     withSourcesJar()
@@ -200,14 +200,16 @@ signing {
 dependencies {
     // Compile and test with the last 7.x version to make sure transition scenarios where
     // the Java API client coexists with a 7.x HLRC work fine
-    val elasticsearchVersion = "8.10.0"
+    val elasticsearchVersion = "8.17.0"
     val jacksonVersion = "2.17.0"
     val openTelemetryVersion = "1.29.0"
 
     // Apache 2.0
     // https://www.elastic.co/guide/en/elasticsearch/client/java-rest/current/java-rest-low.html
     api("org.elasticsearch.client", "elasticsearch-rest-client", elasticsearchVersion)
 
+    api("org.apache.httpcomponents.client5","httpclient5","5.4")
+
     // Apache 2.0
     // https://search.maven.org/artifact/com.google.code.findbugs/jsr305
     api("com.google.code.findbugs:jsr305:3.0.2")
@@ -271,6 +273,16 @@ dependencies {
     // Apache-2.0
     // https://github.com/awaitility/awaitility
     testImplementation("org.awaitility", "awaitility", "4.2.0")
+
+    // MIT
+    // https://github.com/mockito/mockito
+    testImplementation("org.mockito","mockito-core","5.12.0")
+
+    // Apache-2.0
+    // https://github.com/elastic/mocksocket
+    testImplementation("org.elasticsearch","mocksocket","1.2")
+
+
 }
 
 
@@ -285,6 +297,7 @@ class SpdxReporter(val dest: File) : ReportRenderer {
             "The Apache License, Version 2.0" to "Apache-2.0",
             "Apache License, Version 2.0" to "Apache-2.0",
             "The Apache Software License, Version 2.0" to "Apache-2.0",
+            "MIT License" to "MIT",
             "BSD Zero Clause License" to "0BSD",
             "Eclipse Public License 2.0" to "EPL-2.0",
             "Eclipse Public License v. 2.0" to "EPL-2.0",
@@ -311,7 +324,11 @@ class SpdxReporter(val dest: File) : ReportRenderer {
                 val depName = dep.group + ":" + dep.name
 
                 val info = LicenseDataCollector.multiModuleLicenseInfo(dep)
-                val depUrl = info.moduleUrls.first()
+                val depUrl = if (depName.startsWith("org.apache.httpcomponents")) {
+                    "https://hc.apache.org/"
+                } else {
+                    info.moduleUrls.first()
+                }
 
                 val licenseIds = info.licenses.mapNotNull { license ->
                     license.name?.let {

java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchAsyncClient.java

@@ -146,6 +146,7 @@
 import co.elastic.clients.elasticsearch.watcher.ElasticsearchWatcherAsyncClient;
 import co.elastic.clients.elasticsearch.xpack.ElasticsearchXpackAsyncClient;
 import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.ElasticsearchTransportConfig;
 import co.elastic.clients.transport.Endpoint;
 import co.elastic.clients.transport.JsonEndpoint;
 import co.elastic.clients.transport.Transport;
@@ -179,6 +180,23 @@
  */
 public class ElasticsearchAsyncClient extends ApiClient<ElasticsearchTransport, ElasticsearchAsyncClient> {
 
+	/**
+	 * Creates a client from a {@link ElasticsearchTransportConfig.Default}}
+	 * configuration created with an inline lambda expression.
+	 */
+	public static ElasticsearchAsyncClient of(
+			Function<ElasticsearchTransportConfig.Builder, ElasticsearchTransportConfig.Builder> fn) {
+		return new ElasticsearchAsyncClient(
+				fn.apply(new ElasticsearchTransportConfig.Builder()).build().buildTransport());
+	}
+
+	/**
+	 * Creates a client from an {@link ElasticsearchTransportConfig}.
+	 */
+	public ElasticsearchAsyncClient(ElasticsearchTransportConfig config) {
+		this(config.buildTransport());
+	}
+
 	public ElasticsearchAsyncClient(ElasticsearchTransport transport) {
 		super(transport, null);
 	}

java-client/src/main/java/co/elastic/clients/elasticsearch/ElasticsearchClient.java

@@ -147,6 +147,7 @@
 import co.elastic.clients.elasticsearch.watcher.ElasticsearchWatcherClient;
 import co.elastic.clients.elasticsearch.xpack.ElasticsearchXpackClient;
 import co.elastic.clients.transport.ElasticsearchTransport;
+import co.elastic.clients.transport.ElasticsearchTransportConfig;
 import co.elastic.clients.transport.Endpoint;
 import co.elastic.clients.transport.JsonEndpoint;
 import co.elastic.clients.transport.Transport;
@@ -180,6 +181,22 @@
  */
 public class ElasticsearchClient extends ApiClient<ElasticsearchTransport, ElasticsearchClient> {
 
+	/**
+	 * Creates a client from a {@link ElasticsearchTransportConfig.Default}}
+	 * configuration created with an inline lambda expression.
+	 */
+	public static ElasticsearchClient of(
+			Function<ElasticsearchTransportConfig.Builder, ElasticsearchTransportConfig.Builder> fn) {
+		return new ElasticsearchClient(fn.apply(new ElasticsearchTransportConfig.Builder()).build().buildTransport());
+	}
+
+	/**
+	 * Creates a client from an {@link ElasticsearchTransportConfig}.
+	 */
+	public ElasticsearchClient(ElasticsearchTransportConfig config) {
+		this(config.buildTransport());
+	}
+
 	public ElasticsearchClient(ElasticsearchTransport transport) {
 		super(transport, null);
 	}

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

@@ -63,7 +63,7 @@
 @JsonpDeserializable
 public class Script implements IntervalsFilterVariant, JsonpSerializable {
 	@Nullable
-	private final String source;
+	private final ScriptSource source;
 
 	@Nullable
 	private final String id;
@@ -105,7 +105,7 @@ public IntervalsFilter.Kind _intervalsFilterKind() {
 	 * API name: {@code source}
 	 */
 	@Nullable
-	public final String source() {
+	public final ScriptSource source() {
 		return this.source;
 	}
 
@@ -159,7 +159,7 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 
 		if (this.source != null) {
 			generator.writeKey("source");
-			generator.write(this.source);
+			this.source.serialize(generator, mapper);
 
 		}
 		if (this.id != null) {
@@ -210,7 +210,7 @@ public String toString() {
 
 	public static class Builder extends WithJsonObjectBuilderBase<Builder> implements ObjectBuilder<Script> {
 		@Nullable
-		private String source;
+		private ScriptSource source;
 
 		@Nullable
 		private String id;
@@ -229,11 +229,20 @@ public static class Builder extends WithJsonObjectBuilderBase<Builder> implement
 		 * <p>
 		 * API name: {@code source}
 		 */
-		public final Builder source(@Nullable String value) {
+		public final Builder source(@Nullable ScriptSource value) {
 			this.source = value;
 			return this;
 		}
 
+		/**
+		 * The script source.
+		 * <p>
+		 * API name: {@code source}
+		 */
+		public final Builder source(Function<ScriptSource.Builder, ObjectBuilder<ScriptSource>> fn) {
+			return this.source(fn.apply(new ScriptSource.Builder()).build());
+		}
+
 		/**
 		 * The <code>id</code> for a stored script.
 		 * <p>
@@ -338,7 +347,7 @@ public Script build() {
 
 	protected static void setupScriptDeserializer(ObjectDeserializer<Script.Builder> op) {
 
-		op.add(Builder::source, JsonpDeserializer.stringDeserializer(), "source");
+		op.add(Builder::source, ScriptSource._DESERIALIZER, "source");
 		op.add(Builder::id, JsonpDeserializer.stringDeserializer(), "id");
 		op.add(Builder::params, JsonpDeserializer.stringMapDeserializer(JsonData._DESERIALIZER), "params");
 		op.add(Builder::lang, JsonpDeserializer.stringDeserializer(), "lang");