root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Polish 

Closes gh-14914
This commit is contained in:
Brian Clozel 2018-10-29 18:09:42 +01:00
parent 3e6a4eb6e3
commit 2232f7d82f
2 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import org.springframework.boot.actuate.health.HealthIndicator;
*
* @author Stephane Nicoll
* @author Julian Devia Serna
* @author Brian Clozel
* @since 2.0.0
*/
public class ElasticsearchJestHealthIndicator extends AbstractHealthIndicator {
@ -47,14 +48,19 @@ public class ElasticsearchJestHealthIndicator extends AbstractHealthIndicator {
protected void doHealthCheck(Health.Builder builder) throws Exception {
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())) {
builder.outOfService();
if (healthResult.getResponseCode() != 200 || !healthResult.isSucceeded()) {
builder.down();
}
else {
builder.up();
JsonElement root = this.jsonParser.parse(healthResult.getJsonString());
JsonElement status = root.getAsJsonObject().get("status");
if (status.getAsString()
.equals(io.searchbox.cluster.Health.Status.RED.getKey())) {
builder.outOfService();
}
else {
builder.up();
}
}
}

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

@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -40,6 +40,7 @@ import static org.mockito.Mockito.mock;
*
* @author Stephane Nicoll
* @author Julian Devia Serna
* @author Brian Clozel
*/
public class ElasticsearchJestHealthIndicatorTests {
@ -52,7 +53,7 @@ public class ElasticsearchJestHealthIndicatorTests {
@Test
public void elasticsearchIsUp() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult("green", 200, true));
.willReturn(createJestResult(200, true, "green"));
Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.UP);
}
@ -66,44 +67,52 @@ public class ElasticsearchJestHealthIndicatorTests {
assertThat(health.getStatus()).isEqualTo(Status.DOWN);
}
@SuppressWarnings("unchecked")
@Test
public void elasticsearchIsDownWhenQueryDidNotSucceed() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult(200, false, ""));
Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.DOWN);
}
@SuppressWarnings("unchecked")
@Test
public void elasticsearchIsDownByResponseCode() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult(500, false, ""));
Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.DOWN);
}
@SuppressWarnings("unchecked")
@Test
public void elasticsearchIsOutOfServiceByStatus() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult("red", 200, true));
.willReturn(createJestResult(200, true, "red"));
Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.OUT_OF_SERVICE);
}
@SuppressWarnings("unchecked")
@Test
public void elasticsearchIsOutOfServiceByResponseCode() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult("", 500, true));
Health health = this.healthIndicator.health();
assertThat(health.getStatus()).isEqualTo(Status.OUT_OF_SERVICE);
}
private static JestResult createJestResult(int responseCode, boolean succeeded,
String status) {
@SuppressWarnings("unchecked")
@Test
public void elasticsearchIsOutOfServiceBySucceeded() throws IOException {
given(this.jestClient.execute(any(Action.class)))
.willReturn(createJestResult("red", 500, false));
Health health = this.healthIndicator.health();
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);
SearchResult searchResult = new SearchResult(new Gson());
String json;
if (responseCode == 200) {
json = String.format("{\"cluster_name\":\"elasticsearch\","
+ "\"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);
}
else {
json = "{\n" + " \"error\": \"Server Error\",\n" + " \"status\": "
+ responseCode + "\n" + "}";
}
searchResult.setJsonString(json);
searchResult.setJsonObject(new JsonParser().parse(json).getAsJsonObject());
searchResult.setResponseCode(responseCode);