Changed jestHealthCheck to perform cluster health request

Author: amoto

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicator.java

@@ -20,6 +20,7 @@
 import com.google.gson.JsonParser;
 import io.searchbox.client.JestClient;
 import io.searchbox.client.JestResult;
+
 import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
@@ -28,6 +29,7 @@
  * {@link HealthIndicator} for Elasticsearch using a {@link JestClient}.
  *
  * @author Stephane Nicoll
+ * @author Julian David Devia Serna (amoto)
  * @since 2.0.0
  */
 public class ElasticsearchJestHealthIndicator extends AbstractHealthIndicator {
@@ -43,13 +45,15 @@ public ElasticsearchJestHealthIndicator(JestClient jestClient) {
 
 	@Override
 	protected void doHealthCheck(Health.Builder builder) throws Exception {
-		JestResult healthResult = this.jestClient.execute(new io.searchbox.cluster.Health.Builder().build());
+		JestResult healthResult = this.jestClient
+				.execute(new io.searchbox.cluster.Health.Builder().build());
 		JsonElement root = this.jsonParser.parse(healthResult.getJsonString());
 		JsonElement status = root.getAsJsonObject().get("status");
-		if (!healthResult.isSucceeded() || healthResult.getResponseCode() != 200
-				|| status.getAsString().equals(io.searchbox.cluster.Health.Status.RED.getKey())) {
+		if (!healthResult.isSucceeded() || healthResult.getResponseCode() != 200 || status
+				.getAsString().equals(io.searchbox.cluster.Health.Status.RED.getKey())) {
 			builder.outOfService();
-		} else {
+		}
+		else {
 			builder.up();
 		}
 	}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/elasticsearch/ElasticsearchJestHealthIndicatorTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.actuate.elasticsearch;
 
+import java.io.IOException;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonParser;
 import io.searchbox.action.Action;
@@ -24,11 +26,10 @@
 import io.searchbox.client.config.exception.CouldNotConnectException;
 import io.searchbox.core.SearchResult;
 import org.junit.Test;
+
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.Status;
 
-import java.io.IOException;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
@@ -91,14 +92,16 @@ public void elasticsearchIsOutOfServiceBySucceeded() throws IOException {
 		assertThat(health.getStatus()).isEqualTo(Status.OUT_OF_SERVICE);
 	}
 
-	private static JestResult createJestResult(String status, int responseCode, boolean succeeded) {
-		String json = String.format("{\"cluster_name\":\"docker-cluster\"," +
-				"\"status\":\"%s\",\"timed_out\":false,\"number_of_nodes\":1," +
-				"\"number_of_data_nodes\":1,\"active_primary_shards\":0," +
-				"\"active_shards\":0,\"relocating_shards\":0,\"initializing_shards\":0," +
-				"\"unassigned_shards\":0,\"delayed_unassigned_shards\":0," +
-				"\"number_of_pending_tasks\":0,\"number_of_in_flight_fetch\":0," +
-				"\"task_max_waiting_in_queue_millis\":0,\"active_shards_percent_as_number\":100.0}", status);
+	private static JestResult createJestResult(String status, int responseCode,
+			boolean succeeded) {
+		String json = String.format("{\"cluster_name\":\"docker-cluster\","
+				+ "\"status\":\"%s\",\"timed_out\":false,\"number_of_nodes\":1,"
+				+ "\"number_of_data_nodes\":1,\"active_primary_shards\":0,"
+				+ "\"active_shards\":0,\"relocating_shards\":0,\"initializing_shards\":0,"
+				+ "\"unassigned_shards\":0,\"delayed_unassigned_shards\":0,"
+				+ "\"number_of_pending_tasks\":0,\"number_of_in_flight_fetch\":0,"
+				+ "\"task_max_waiting_in_queue_millis\":0,\"active_shards_percent_as_number\":100.0}",
+				status);
 		SearchResult searchResult = new SearchResult(new Gson());
 		searchResult.setJsonString(json);
 		searchResult.setJsonObject(new JsonParser().parse(json).getAsJsonObject());