porting low level client unit tests

Author: l-trotta

java-client/build.gradle.kts

@@ -273,6 +273,20 @@ 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/randomizedtesting/randomizedtesting
+    testImplementation("com.carrotsearch.randomizedtesting","randomizedtesting-runner","2.8.1")
+
+    // Apache-2.0
+    // https://github.com/elastic/mocksocket
+    testImplementation("org.elasticsearch","mocksocket","1.2")
+
+
 }
 
 

java-client/src/main/java/co/elastic/clients/transport/rest5_client/Rest5ClientHttpClient.java

@@ -23,8 +23,6 @@
 import co.elastic.clients.transport.http.HeaderMap;
 import co.elastic.clients.transport.http.TransportHttpClient;
 import co.elastic.clients.transport.rest5_client.low_level.Cancellable;
-import co.elastic.clients.transport.rest5_client.low_level.ESRequest;
-import co.elastic.clients.transport.rest5_client.low_level.ESResponse;
 import co.elastic.clients.transport.rest5_client.low_level.ResponseListener;
 import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import co.elastic.clients.util.BinaryData;
@@ -91,8 +89,8 @@ public Rest5ClientOptions createOptions(@Nullable TransportOptions options) {
     public Response performRequest(String endpointId, @Nullable Node node, Request request,
                                    TransportOptions options) throws IOException {
         Rest5ClientOptions rcOptions = Rest5ClientOptions.of(options);
-        ESRequest restRequest = createRestRequest(request, rcOptions);
-        ESResponse restResponse = restClient.performRequest(restRequest);
+        co.elastic.clients.transport.rest5_client.low_level.Request restRequest = createRestRequest(request, rcOptions);
+        co.elastic.clients.transport.rest5_client.low_level.Response restResponse = restClient.performRequest(restRequest);
         return new RestResponse(restResponse);
     }
 
@@ -102,7 +100,7 @@ public CompletableFuture<Response> performRequestAsync(
     ) {
 
         RequestFuture<Response> future = new RequestFuture<>();
-        ESRequest restRequest;
+        co.elastic.clients.transport.rest5_client.low_level.Request restRequest;
 
         try {
             Rest5ClientOptions rcOptions = Rest5ClientOptions.of(options);
@@ -115,7 +113,7 @@ public CompletableFuture<Response> performRequestAsync(
 
         future.cancellable = restClient.performRequestAsync(restRequest, new ResponseListener() {
             @Override
-            public void onSuccess(ESResponse response) {
+            public void onSuccess(co.elastic.clients.transport.rest5_client.low_level.Response response) {
                 future.complete(new RestResponse(response));
             }
 
@@ -133,8 +131,8 @@ public void close() throws IOException {
         this.restClient.close();
     }
 
-    private ESRequest createRestRequest(Request request, Rest5ClientOptions options) {
-        ESRequest clientReq = new ESRequest(
+    private co.elastic.clients.transport.rest5_client.low_level.Request createRestRequest(Request request, Rest5ClientOptions options) {
+        co.elastic.clients.transport.rest5_client.low_level.Request clientReq = new co.elastic.clients.transport.rest5_client.low_level.Request(
             request.method(), request.path()
         );
 
@@ -180,9 +178,9 @@ private ESRequest createRestRequest(Request request, Rest5ClientOptions options)
     }
 
     static class RestResponse implements Response {
-        private final ESResponse restResponse;
+        private final co.elastic.clients.transport.rest5_client.low_level.Response restResponse;
 
-        RestResponse(ESResponse restResponse) {
+        RestResponse(co.elastic.clients.transport.rest5_client.low_level.Response restResponse) {
             this.restResponse = restResponse;
         }
 
@@ -234,7 +232,7 @@ public BinaryData body() throws IOException {
 
         @Nullable
         @Override
-        public ESResponse originalResponse() {
+        public co.elastic.clients.transport.rest5_client.low_level.Response originalResponse() {
             return this.restResponse;
         }
 

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/Cancellable.java

@@ -26,7 +26,7 @@
 /**
  * Represents an operation that can be cancelled.
  * Returned when executing async requests through
- * {@link Rest5Client#performRequestAsync(ESRequest, ResponseListener)}, so that the request
+ * {@link Rest5Client#performRequestAsync(Request, ResponseListener)}, so that the request
  * can be cancelled if needed. Cancelling a request will result in calling
  * {@link HttpUriRequestBase#abort()} on the underlying
  * request object, which will in turn cancel its corresponding {@link java.util.concurrent.Future}.

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/ESRequest.java renamed to java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/Request.java

@@ -33,7 +33,7 @@
 /**
  * HTTP Request to Elasticsearch.
  */
-public final class ESRequest {
+public final class Request {
     private final String method;
     private final String endpoint;
     private final Map<String, String> parameters = new HashMap<>();
@@ -42,11 +42,11 @@ public final class ESRequest {
     private RequestOptions options = RequestOptions.DEFAULT;
 
     /**
-     * Create the {@linkplain ESRequest}.
+     * Create the {@linkplain Request}.
      * @param method the HTTP method
      * @param endpoint the path of the request (without scheme, host, port, or prefix)
      */
-    public ESRequest(String method, String endpoint) {
+    public Request(String method, String endpoint) {
         this.method = Objects.requireNonNull(method, "method cannot be null");
         this.endpoint = Objects.requireNonNull(endpoint, "endpoint cannot be null");
     }
@@ -173,7 +173,7 @@ public boolean equals(Object obj) {
             return true;
         }
 
-        ESRequest other = (ESRequest) obj;
+        Request other = (Request) obj;
         return method.equals(other.method)
             && endpoint.equals(other.endpoint)
             && parameters.equals(other.parameters)

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/ESResponse.java renamed to java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/Response.java

@@ -37,13 +37,13 @@
  * Holds an elasticsearch response. It wraps the {@link BasicClassicHttpResponse} returned and associates
  * it with its corresponding {@link RequestLine} and {@link HttpHost}.
  */
-public class ESResponse {
+public class Response {
 
     private final RequestLine requestLine;
     private final HttpHost host;
     private final ClassicHttpResponse response;
 
-    ESResponse(RequestLine requestLine, HttpHost host, ClassicHttpResponse response) {
+    Response(RequestLine requestLine, HttpHost host, ClassicHttpResponse response) {
         Objects.requireNonNull(requestLine, "requestLine cannot be null");
         Objects.requireNonNull(host, "host cannot be null");
         Objects.requireNonNull(response, "response cannot be null");

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/ResponseException.java

@@ -33,14 +33,14 @@
  */
 public final class ResponseException extends IOException {
 
-    private final ESResponse response;
+    private final Response response;
 
-    public ResponseException(ESResponse response) throws IOException {
+    public ResponseException(Response response) throws IOException {
         super(buildMessage(response));
         this.response = response;
     }
 
-    static String buildMessage(ESResponse response) throws IOException {
+    static String buildMessage(Response response) throws IOException {
         String message = String.format(
             Locale.ROOT,
             "method [%s], host [%s], URI [%s], status line [%s]",
@@ -70,9 +70,9 @@ static String buildMessage(ESResponse response) throws IOException {
     }
 
     /**
-     * Returns the {@link ESResponse} that caused this exception to be thrown.
+     * Returns the {@link Response} that caused this exception to be thrown.
      */
-    public ESResponse getResponse() {
+    public Response getResponse() {
         return response;
     }
 }

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/ResponseListener.java

@@ -33,7 +33,7 @@ public interface ResponseListener {
     /**
      * Method invoked if the request yielded a successful response
      */
-    void onSuccess(ESResponse response);
+    void onSuccess(Response response);
 
     /**
      * Method invoked if the request failed. There are two main categories of failures: connection failures (usually

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/Rest5Client.java

@@ -95,7 +95,7 @@
  * The hosts that are part of the cluster need to be provided at creation time, but can also be replaced later
  * by calling {@link #setNodes(Collection)}.
  * <p>
- * The method {@link #performRequest(ESRequest)} allows to send a request to the cluster. When
+ * The method {@link #performRequest(Request)} allows to send a request to the cluster. When
  * sending a request, a host gets selected out of the provided ones in a round-robin fashion. Failing hosts
  * are marked dead and
  * retried after a certain amount of time (minimum 1 minute, maximum 30 minutes), depending on how many
@@ -296,13 +296,13 @@ public boolean isRunning() {
      * @throws ResponseException       in case Elasticsearch responded with a status code that indicated an
      *                                 error
      */
-    public ESResponse performRequest(ESRequest request) throws IOException {
+    public Response performRequest(Request request) throws IOException {
         InternalRequest internalRequest = new InternalRequest(request);
         return performRequest(nextNodes(), internalRequest, null);
     }
 
-    private ESResponse performRequest(final Iterator<Node> nodes, final InternalRequest request,
-                                      Exception previousException)
+    private Response performRequest(final Iterator<Node> nodes, final InternalRequest request,
+                                    Exception previousException)
         throws IOException {
         RequestContext context = request.createContextForNextAttempt(nodes.next());
         ClassicHttpResponse httpResponse;
@@ -360,7 +360,7 @@ private ResponseOrResponseException convertResponse(InternalRequest request, Nod
             }
         }
 
-        ESResponse response = new ESResponse(new RequestLine(request.httpRequest), node.getHost(), httpResponse);
+        Response response = new Response(new RequestLine(request.httpRequest), node.getHost(), httpResponse);
         if (isCorrectServerResponse(statusCode)) {
             onResponse(node);
             if (request.warningsHandler.warningsShouldFailRequest(response.getWarnings())) {
@@ -395,7 +395,7 @@ private ResponseOrResponseException convertResponse(InternalRequest request, Nod
      * @param responseListener the {@link ResponseListener} to notify when the
      *                         request is completed or fails
      */
-    public Cancellable performRequestAsync(ESRequest request, ResponseListener responseListener) {
+    public Cancellable performRequestAsync(Request request, ResponseListener responseListener) {
         try {
             FailureTrackingResponseListener failureTrackingResponseListener =
                 new FailureTrackingResponseListener(responseListener);
@@ -726,7 +726,7 @@ static class FailureTrackingResponseListener {
         /**
          * Notifies the caller of a response through the wrapped listener
          */
-        void onSuccess(ESResponse response) {
+        void onSuccess(Response response) {
             responseListener.onSuccess(response);
         }
 
@@ -812,12 +812,12 @@ public void remove() {
     }
 
     private class InternalRequest {
-        private final ESRequest request;
+        private final Request request;
         private final HttpUriRequestBase httpRequest;
         private final Cancellable cancellable;
         private final WarningsHandler warningsHandler;
 
-        InternalRequest(ESRequest request) {
+        InternalRequest(Request request) {
             this.request = request;
             Map<String, String> params = new HashMap<>(request.getParameters());
             params.putAll(request.getOptions().getParameters());
@@ -897,10 +897,10 @@ private static class RequestContext {
     }
 
     private static class ResponseOrResponseException {
-        private final ESResponse response;
+        private final Response response;
         private final ResponseException responseException;
 
-        ResponseOrResponseException(ESResponse response) {
+        ResponseOrResponseException(Response response) {
             this.response = Objects.requireNonNull(response);
             this.responseException = null;
         }

java-client/src/main/java/co/elastic/clients/transport/rest5_client/low_level/WarningFailureException.java

@@ -24,17 +24,17 @@
 import static co.elastic.clients.transport.rest5_client.low_level.ResponseException.buildMessage;
 
 /**
- * This exception is used to indicate that one or more {@link ESResponse#getWarnings()} exist
+ * This exception is used to indicate that one or more {@link Response#getWarnings()} exist
  * and is typically used when the {@link Rest5Client} is set to fail by setting
  * {@link Rest5ClientBuilder#setStrictDeprecationMode(boolean)} to `true`.
  */
 // This class extends RuntimeException in order to deal with wrapping that is done in FutureUtils on exception.
 // if the exception is not of type ElasticsearchException or RuntimeException it will be wrapped in a UncategorizedExecutionException
 public final class WarningFailureException extends RuntimeException {
 
-    private final ESResponse response;
+    private final Response response;
 
-    public WarningFailureException(ESResponse response) throws IOException {
+    public WarningFailureException(Response response) throws IOException {
         super(buildMessage(response));
         this.response = response;
     }
@@ -50,9 +50,9 @@ public WarningFailureException(ESResponse response) throws IOException {
     }
 
     /**
-     * Returns the {@link ESResponse} that caused this exception to be thrown.
+     * Returns the {@link Response} that caused this exception to be thrown.
      */
-    public ESResponse getResponse() {
+    public Response getResponse() {
         return response;
     }
 }

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

@@ -26,7 +26,7 @@
 import co.elastic.clients.elasticsearch._helpers.esql.objects.ObjectsEsqlAdapter;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
-import co.elastic.clients.transport.rest5_client.low_level.ESRequest;
+import co.elastic.clients.transport.rest5_client.low_level.Request;
 import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -35,7 +35,6 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
-import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RestClient;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -64,7 +63,7 @@ public static void setup() throws Exception {
 
             esClient.indices().delete(d -> d.index("employees").ignoreUnavailable(true));
 
-            Request request = new Request("POST", "/employees/_bulk?refresh=true");
+            org.elasticsearch.client.Request request = new org.elasticsearch.client.Request("POST", "/employees/_bulk?refresh=true");
 
             InputStream resourceAsStream = EsqlAdapterTest.class.getResourceAsStream("employees.ndjson");
             byte[] bytes = IOUtils.toByteArray(resourceAsStream);
@@ -77,7 +76,7 @@ public static void setup() throws Exception {
 
             esClient.indices().delete(d -> d.index("employees").ignoreUnavailable(true));
 
-            ESRequest request = new ESRequest("POST", "/employees/_bulk?refresh=true");
+            Request request = new Request("POST", "/employees/_bulk?refresh=true");
 
             InputStream resourceAsStream = EsqlAdapterTest.class.getResourceAsStream("employees.ndjson");
             byte[] bytes = IOUtils.toByteArray(resourceAsStream);

java-client/src/test/java/co/elastic/clients/transport/rest5_client/TransportTest.java

@@ -25,7 +25,7 @@
 import co.elastic.clients.transport.TransportException;
 import co.elastic.clients.transport.http.RepeatableBodyResponse;
 import co.elastic.clients.transport.http.TransportHttpClient;
-import co.elastic.clients.transport.rest5_client.low_level.ESResponse;
+import co.elastic.clients.transport.rest5_client.low_level.Response;
 import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
 import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
 import co.elastic.clients.util.BinaryData;
@@ -81,7 +81,7 @@ public void testXMLResponse() throws Exception {
         assertEquals("es/cat.indices", ex.endpointId());
 
         // Original response is transport-dependent
-        ESResponse restClientResponse = (ESResponse) ex.response().originalResponse();
+        Response restClientResponse = (Response) ex.response().originalResponse();
         assertEquals(401, restClientResponse.getStatusCode());
     }