Move Node back to its original location. TransportHttpClient is self-contained

Author: swallez

java-client/src/main/java/co/elastic/clients/transport/http/Node.java

@@ -45,7 +45,7 @@ public RepeatableBodyResponse(TransportHttpClient.Response response) throws IOEx
     }
 
     @Override
-    public Node node() {
+    public TransportHttpClient.Node node() {
         return response.node();
     }
 

java-client/src/main/java/co/elastic/clients/transport/http/RepeatableBodyResponse.java

@@ -26,9 +26,12 @@
 import javax.annotation.Nullable;
 import java.io.Closeable;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 
 /**
@@ -182,4 +185,110 @@ interface Response extends Closeable {
          */
         void close() throws IOException;
     }
+
+    /**
+     * A node/host to send requests to.
+     */
+    class Node {
+        private final URI uri;
+        private final String name;
+        private final String version;
+        private final Set<String> roles;
+        private final Map<String, String> attributes;
+
+        /**
+         * Create a node with its URI, roles and attributes.
+         * <p>
+         * If the URI doesn't end with a '{@code /}', then one is added.
+         *
+         * @param uri        the node's URI
+         * @param name       the node name/identifier
+         * @param version    the node's version, if known
+         * @param roles      the node's roles, such as "master", "ingest", etc.
+         * @param attributes the node's attributes. This can be used for routing decisions by multi-node implementations.
+         */
+        public Node(
+            URI uri,
+            @Nullable String name,
+            @Nullable String version,
+            @Nullable Set<String> roles,
+            @Nullable Map<String, String> attributes
+        ) {
+
+            if (!uri.isAbsolute()) {
+                throw new IllegalArgumentException("Node URIs must be absolute: " + uri);
+            }
+
+            if (!uri.getRawPath().endsWith("/")) {
+                uri = uri.resolve(uri.getRawPath() + "/");
+            }
+
+            this.uri = uri;
+            this.name = name;
+            this.version = version;
+            this.roles = roles;
+            this.attributes = attributes;
+        }
+
+        public Node(URI uri) {
+            this(uri, null, null, null, null);
+        }
+
+        public Node(String uri) {
+            this(URI.create(uri), null, null, null, null);
+        }
+
+        /**
+         * The URI of this node. This is an absolute URL with a path ending with a "/".
+         */
+        public URI uri() {
+            return this.uri;
+        }
+
+        /**
+         * The node name/identifier
+         */
+        @Nullable
+        public String name() {
+            return name;
+        }
+
+        @Nullable
+        public String version() {
+            return version;
+        }
+
+        @Nullable
+        public Set<String> roles() {
+            return roles;
+        }
+
+        @Nullable
+        public Map<String, String> attributes() {
+            return attributes;
+        }
+
+        @Override
+        public String toString() {
+            return uri.toString();
+        }
+
+        /**
+         * Two nodes are considered equal if their URIs are equal. Other properties are ignored.
+         */
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Node node)) return false;
+            return Objects.equals(uri, node.uri);
+        }
+
+        /**
+         * A node's hash code is that of its URI. Other properties are ignored.
+         */
+        @Override
+        public int hashCode() {
+            return Objects.hash(uri);
+        }
+    }
 }

java-client/src/main/java/co/elastic/clients/transport/http/TransportHttpClient.java

@@ -21,7 +21,6 @@
 
 import co.elastic.clients.transport.TransportOptions;
 import co.elastic.clients.transport.http.HeaderMap;
-import co.elastic.clients.transport.http.Node;
 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.ResponseListener;

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

@@ -21,7 +21,6 @@
 
 import co.elastic.clients.transport.TransportOptions;
 import co.elastic.clients.transport.http.HeaderMap;
-import co.elastic.clients.transport.http.Node;
 import co.elastic.clients.transport.http.TransportHttpClient;
 import co.elastic.clients.util.BinaryData;
 import co.elastic.clients.util.NoCopyByteArrayOutputStream;

java-client/src/main/java/co/elastic/clients/transport/rest_client/RestClientHttpClient.java

@@ -24,7 +24,6 @@
 import co.elastic.clients.transport.ElasticsearchTransportBase;
 import co.elastic.clients.transport.TransportException;
 import co.elastic.clients.transport.TransportOptions;
-import co.elastic.clients.transport.http.Node;
 import co.elastic.clients.transport.http.TransportHttpClient;
 import co.elastic.clients.util.BinaryData;
 import org.jetbrains.annotations.Nullable;

java-client/src/test/java/co/elastic/clients/testkit/MockHttpClient.java

@@ -26,7 +26,6 @@
 import co.elastic.clients.transport.ElasticsearchTransport;
 import co.elastic.clients.transport.ElasticsearchTransportBase;
 import co.elastic.clients.transport.TransportOptions;
-import co.elastic.clients.transport.http.Node;
 import co.elastic.clients.transport.http.TransportHttpClient;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.Test;