Fix ElasticSearch ping InfoFacade endpoint

src/main/java/uk/ac/cam/cl/dtg/segue/api/InfoFacade.java

@@ -16,6 +16,9 @@
 
 package uk.ac.cam.cl.dtg.segue.api;
 
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.HealthStatus;
+import co.elastic.clients.elasticsearch.cluster.HealthResponse;
 import com.google.common.collect.ImmutableMap;
 import com.google.inject.Inject;
 import io.swagger.v3.oas.annotations.Operation;
@@ -42,6 +45,7 @@
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.util.Objects;
+import java.util.Set;
 
 import static uk.ac.cam.cl.dtg.segue.api.Constants.*;
 
@@ -56,6 +60,7 @@
 public class InfoFacade extends AbstractSegueFacade {
     private static final Logger log = LoggerFactory.getLogger(InfoFacade.class);
     private final SegueJobService segueJobService;
+    private final ElasticsearchClient searchClient;
     private final HttpClient httpClient;
 
     /**
@@ -66,9 +71,11 @@ public class InfoFacade extends AbstractSegueFacade {
      */
     @Inject
     public InfoFacade(final AbstractConfigLoader properties, final SegueJobService segueJobService,
+                      final ElasticsearchClient searchClient,
                       final ILogManager logManager) {
         super(properties, logManager);
         this.segueJobService = segueJobService;
+        this.searchClient = searchClient;
         this.httpClient = HttpClient.newHttpClient();
     }
 
@@ -171,8 +178,16 @@ public Response pingETLServer() {
     @Operation(summary = "Check whether elasticsearch is running.")
     public Response pingElasticSearch() {
 
-        return pingUrlForStatus("http://" + getProperties().getProperty("SEARCH_CLUSTER_ADDRESS") + ":"
-                    + getProperties().getProperty("SEARCH_CLUSTER_INFO_PORT") + "/_cat/health");
+        boolean healthy = false;
+        try {
+            HealthResponse response = searchClient.cluster().health();
+            // Green: all okay with replicas.  Yellow: either indexing, no replica, or local dev.
+            healthy = Set.of(HealthStatus.Green, HealthStatus.Yellow).contains(response.status());
+        } catch (final IOException e) {
+            log.warn("Error whilst checking ElasticSearch status! {}", e.toString());
+        }
+
+        return Response.ok(ImmutableMap.of("success", healthy)).build();
     }
 
     /**

src/test/java/uk/ac/cam/cl/dtg/isaac/api/AbstractIsaacIntegrationTest.java

@@ -1,5 +1,6 @@
 package uk.ac.cam.cl.dtg.isaac.api;
 
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.google.api.client.util.Maps;
@@ -104,8 +105,6 @@
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static uk.ac.cam.cl.dtg.segue.api.Constants.*;
-import static uk.ac.cam.cl.dtg.segue.api.Constants.EMAIL_SIGNATURE;
-import static uk.ac.cam.cl.dtg.segue.api.Constants.HOST_NAME;
 
 /**
  * IMPORTANT: Rather than directly subclass this, use either IsaacIntegrationTestWithREST or IsaacIntegrationTest
@@ -124,6 +123,7 @@ public class AbstractIsaacIntegrationTest {
     protected static AbstractConfigLoader properties;
     protected static Map<String, String> globalTokens;
     protected static PostgresSqlDb postgresSqlDb;
+    protected static ElasticsearchClient elasticSearchClient;
     protected static ElasticSearchIndexer elasticSearchProvider;
     protected static SchoolListReader schoolListReader;
     protected static MainMapper mainMapper;
@@ -188,13 +188,13 @@ public class AbstractIsaacIntegrationTest {
         elasticsearch.start();
 
         try {
-            elasticSearchProvider = new ElasticSearchIndexer(ElasticSearchProvider.getClient(
+            elasticSearchClient = ElasticSearchProvider.getClient(
                     "localhost",
                     elasticsearch.getMappedPort(9200),
                     "elastic",
                     "elastic"
-            )
             );
+            elasticSearchProvider = new ElasticSearchIndexer(elasticSearchClient);
         } catch (UnknownHostException e) {
             throw new RuntimeException(e);
         }

src/test/java/uk/ac/cam/cl/dtg/isaac/api/InfoFacadeIT.java

@@ -23,7 +23,7 @@ public class InfoFacadeIT extends IsaacIntegrationTest {
     @BeforeEach
     public void setUp() throws RuntimeException, IOException {
         SegueJobService segueJobService = createNiceMock(SegueJobService.class); // new SegueJobService(new ArrayList<>(), postgresSqlDb);
-        infoFacade = new InfoFacade(properties, segueJobService, logManager);
+        infoFacade = new InfoFacade(properties, segueJobService, elasticSearchClient, logManager);
     }
 
     @Test
@@ -59,13 +59,21 @@ public void etlPing_respondsOK() {
         // /info/etl/ping
         Response response = infoFacade.pingETLServer();
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        @SuppressWarnings("unchecked")
+        ImmutableMap<String, Boolean> status = (ImmutableMap<String, Boolean>) response.getEntity();
+        // ETL does not run during IT Tests, expect failure:
+        assertEquals(false, status.get("success"));
     }
 
     @Test
     public void elasticsearchPing_respondsOK() {
         // /info/elasticsearch/ping
         Response response = infoFacade.pingElasticSearch();
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+        @SuppressWarnings("unchecked")
+        ImmutableMap<String, Boolean> status = (ImmutableMap<String, Boolean>) response.getEntity();
+        // ElasticSearch does run during IT Tests, expect success:
+        assertEquals(true, status.get("success"));
     }
 
     // NOTE: The other methods are probably less useful to test unless we also bring up the checkers