make benchmark unit test easier to run with startlocal

Author: l-trotta

java-client/src/test/java/co/elastic/clients/elasticsearch/ElasticsearchTestClient.java

@@ -57,21 +57,23 @@ private static JsonpMapper mapper(JsonpMapper mapper) {
         return mapper != null ? mapper : new JsonbJsonpMapper();
     }
 
-    public static ElasticsearchClient createClient(String url, @Nullable JsonpMapper mapper, @Nullable SSLContext sslContext) {
+    public static ElasticsearchClient createClient(String url, @Nullable JsonpMapper mapper, @Nullable SSLContext sslContext, @Nullable String password) {
         System.out.println("Using a " + flavor + " client");
 
+        String pwd = password == null ? "changeme" : password;
+
         return ElasticsearchClient.of(b -> b
             .host(url)
             .jsonMapper(mapper(mapper))
-            .usernameAndPassword("elastic", "changeme")
+            .usernameAndPassword("elastic", pwd)
             .sslContext(sslContext)
             .transportFactory(flavor.transportFactory())
         );
     }
 
     public static ElasticsearchClient createClient(HttpServer server, @Nullable JsonpMapper mapper) {
         var address = server.getAddress();
-        return createClient("http://" + address.getHostString() + ":" + address.getPort(), mapper, null);
+        return createClient("http://" + address.getHostString() + ":" + address.getPort(), mapper, null, null);
     }
 
     public static Function<ElasticsearchTransportConfig, ElasticsearchTransport> transportFactory() {

java-client/src/test/java/co/elastic/clients/elasticsearch/ElasticsearchTestServer.java

@@ -30,8 +30,10 @@
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
+import org.testcontainers.shaded.org.bouncycastle.cert.ocsp.Req;
 import org.testcontainers.utility.DockerImageName;
 
+import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.InputStream;
@@ -59,15 +61,20 @@ public class ElasticsearchTestServer implements AutoCloseable {
                                                  ".co/elasticsearch/latest/master.json";
 
     public static synchronized ElasticsearchTestServer global() {
+        return global(null);
+    }
+
+    public static synchronized ElasticsearchTestServer global(@Nullable String password) {
         if (global == null) {
 
-            // Try localhost:9200
+            // Try localhost:9200 with set password
             try {
+                String pwd = password == null ? "changeme" : password;
                 String localUrl = "http://localhost:9200";
                 HttpURLConnection connection = (HttpURLConnection) new URL(localUrl).openConnection();
                 connection.setRequestProperty("Authorization", "Basic " +
                                                                Base64.getEncoder().encodeToString(("elastic" +
-                                                               ":changeme").getBytes(StandardCharsets.UTF_8)));
+                                                               ":" + pwd).getBytes(StandardCharsets.UTF_8)));
 
                 try (InputStream input = connection.getInputStream()) {
                     String content = IOUtils.toString(input, StandardCharsets.UTF_8);
@@ -103,7 +110,7 @@ public ElasticsearchTestServer(String... plugins) {
     protected void setup(String url, SSLContext sslContext) {
         this.url = url;
         this.sslContext = sslContext;
-        this.client = ElasticsearchTestClient.createClient(url, null, sslContext);
+        this.client = ElasticsearchTestClient.createClient(url, null, sslContext, null);
     }
 
     private Version selectLatestVersion(Version version) {

java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java

@@ -55,7 +55,7 @@ public class EsqlAdapterEndToEndTest extends Assertions {
     @BeforeAll
     public static void setup() throws Exception {
         var server = ElasticsearchTestServer.global();
-        esClient = ElasticsearchTestClient.createClient(server.url(), new JacksonJsonpMapper(), server.sslContext());
+        esClient = ElasticsearchTestClient.createClient(server.url(), new JacksonJsonpMapper(), server.sslContext(), null);
 
         // Make sure index is empty
         esClient.indices().delete(d -> d.index("employees").ignoreUnavailable(true));

java-client/src/test/java/co/elastic/clients/elasticsearch/experiments/benchmark/base64vectors/MainCommonBenchmark64.java

@@ -20,9 +20,11 @@
 package co.elastic.clients.elasticsearch.experiments.benchmark.base64vectors;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch.ElasticsearchTestClient;
 import co.elastic.clients.elasticsearch.ElasticsearchTestServer;
 import co.elastic.clients.elasticsearch.core.BulkRequest;
 import co.elastic.clients.elasticsearch.core.bulk.BulkOperation;
+import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import com.fasterxml.jackson.databind.MappingIterator;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
@@ -51,7 +53,8 @@ public class MainCommonBenchmark64 {
 
     @BeforeAll
     public static void setup() {
-        elasticsearchClient = ElasticsearchTestServer.global().client();
+        var server = ElasticsearchTestServer.global();
+        elasticsearchClient = ElasticsearchTestClient.createClient(server.url(), new JacksonJsonpMapper(), server.sslContext(), null);
     }
 
     public static List<ElasticsearchDoc> readMultipleObjects(InputStream file) throws IOException {

java-client/src/test/java/co/elastic/clients/transport/TransportUtilsTest.java

@@ -83,7 +83,7 @@ public void testCaCertificate() throws Exception {
 
     private void checkConnection(SSLContext sslContext) throws Exception {
         var server = ElasticsearchTestServer.global();
-        var esClient = ElasticsearchTestClient.createClient(server.url(), null, sslContext);
+        var esClient = ElasticsearchTestClient.createClient(server.url(), null, sslContext, null);
 
         assertNotNull(esClient.info());
     }