HSEARCH-5464 Remove the apache host from ElasticsearchResponse

Author: marko-bekhta

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientImpl.java

@@ -199,7 +199,7 @@ private ElasticsearchResponse convertResponse(Response response) {
 		try {
 			JsonObject body = parseBody( response );
 			return new ElasticsearchResponse(
-					response.getHost(),
+					response.getHost().toHostString(),
 					response.getStatusLine().getStatusCode(),
 					response.getStatusLine().getReasonPhrase(),
 					body );

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/spi/ElasticsearchResponse.java

@@ -4,27 +4,24 @@
  */
 package org.hibernate.search.backend.elasticsearch.client.spi;
 
-import com.google.gson.JsonObject;
+import java.util.Objects;
 
-import org.apache.http.HttpHost;
+import com.google.gson.JsonObject;
 
 public final class ElasticsearchResponse {
-
-	private final HttpHost host;
+	private final String host;
 	private final int statusCode;
-
 	private final String statusMessage;
-
 	private final JsonObject body;
 
-	public ElasticsearchResponse(HttpHost host, int statusCode, String statusMessage, JsonObject body) {
+	public ElasticsearchResponse(String host, int statusCode, String statusMessage, JsonObject body) {
 		this.host = host;
 		this.statusCode = statusCode;
 		this.statusMessage = statusMessage;
 		this.body = body;
 	}
 
-	public HttpHost host() {
+	public String host() {
 		return host;
 	}
 
@@ -39,5 +36,4 @@ public String statusMessage() {
 	public JsonObject body() {
 		return body;
 	}
-
 }

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchRequestLog.java

@@ -19,8 +19,6 @@
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageLogger;
 
-import org.apache.http.HttpHost;
-
 @CategorizedLogger(
 		category = ElasticsearchRequestLog.CATEGORY_NAME,
 		description = """
@@ -51,7 +49,7 @@ public interface ElasticsearchRequestLog extends BasicLogger {
 			value = "Executed Elasticsearch HTTP %s request to '%s' with path '%s',"
 					+ " query parameters %s and %d objects in payload in %dms."
 					+ " Response had status %d '%s'. Request body: <%s>. Response body: <%s>")
-	void executedRequestWithFailure(String method, HttpHost host, String path, Map<String, String> getParameters,
+	void executedRequestWithFailure(String method, String host, String path, Map<String, String> getParameters,
 			int bodyParts, long timeInMs,
 			int responseStatusCode, String responseStatusMessage,
 			String requestBodyParts, String responseBody);
@@ -61,7 +59,7 @@ void executedRequestWithFailure(String method, HttpHost host, String path, Map<S
 			value = "Executed Elasticsearch HTTP %s request to '%s' with path '%s',"
 					+ " query parameters %s and %d objects in payload in %dms."
 					+ " Response had status %d '%s'. Request body: <%s>. Response body: <%s>")
-	void executedRequest(String method, HttpHost host, String path, Map<String, String> getParameters, int bodyParts,
+	void executedRequest(String method, String host, String path, Map<String, String> getParameters, int bodyParts,
 			long timeInMs,
 			int responseStatusCode, String responseStatusMessage,
 			String requestBodyParts, String responseBody);

backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientUtilsTryGetElasticsearchVersionTest.java

@@ -116,7 +116,7 @@ void testHttpStatus404(String distributionString, String versionString,
 		// which doesn't allow retrieving the version.
 		when( clientMock.submit( any() ) )
 				.thenReturn( CompletableFuture.completedFuture( new ElasticsearchResponse(
-						new HttpHost( "mockHost:9200" ), 404, "", null ) ) );
+						"mockHost:9200", 404, "", null ) ) );
 		ElasticsearchVersion version = ElasticsearchClientUtils.tryGetElasticsearchVersion( clientMock );
 		assertThat( version ).isNull();
 	}
@@ -131,6 +131,6 @@ private void doMock(String theDistributionString, String theVersionString) {
 		responseBody.add( "version", versionObject );
 		when( clientMock.submit( any() ) )
 				.thenReturn( CompletableFuture.completedFuture( new ElasticsearchResponse(
-						new HttpHost( "mockHost:9200" ), 200, "", responseBody ) ) );
+						"mockHost:9200", 200, "", responseBody ) ) );
 	}
 }

backend/elasticsearch/src/test/java/org/hibernate/search/backend/elasticsearch/work/impl/BulkWorkTest.java

@@ -76,7 +76,7 @@ void execute_success() {
 		responseBody.add( "items", items );
 		items.add( new JsonObject() );
 		items.add( new JsonObject() );
-		ElasticsearchResponse response = new ElasticsearchResponse( new HttpHost( "mockHost:9200" ),
+		ElasticsearchResponse response = new ElasticsearchResponse( "mockHost:9200",
 				200, "OK", responseBody );
 		futureFromClient.complete( response );
 		verifyNoOtherClientInteractionsAndReset();
@@ -120,7 +120,7 @@ void execute_http500() {
 
 		JsonObject responseBody = new JsonObject();
 		responseBody.addProperty( "someProperty", "someValue" );
-		ElasticsearchResponse response = new ElasticsearchResponse( new HttpHost( "mockHost:9200" ),
+		ElasticsearchResponse response = new ElasticsearchResponse( "mockHost:9200",
 				500, "SomeStatus", responseBody );
 		futureFromClient.complete( response );
 		verifyNoOtherClientInteractionsAndReset();