Responding to feedback

Author: epugh

solr/api/src/java/org/apache/solr/client/api/endpoint/NodeHealthApi.java

@@ -37,8 +37,7 @@ NodeHealthResponse healthcheck(
               description =
                   "Maximum number of index generations a follower replica may lag behind its"
                       + " leader before the health check reports FAILURE. Only relevant when"
-                      + " running in legacy (non-SolrCloud) mode with leader/follower"
-                      + " replication.")
+                      + " running in Standalone mode with leader/follower replication.")
           @QueryParam("maxGenerationLag")
           Integer maxGenerationLag);
 }

…lr/handler/admin/api/NodeHealthTest.java …r/admin/api/NodeHealthSolrCloudTest.javasolr/core/src/test/org/apache/solr/handler/admin/api/NodeHealthTest.java renamed to solr/core/src/test/org/apache/solr/handler/admin/api/NodeHealthSolrCloudTest.java solr/core/src/test/org/apache/solr/handler/admin/api/NodeHealthTest.java renamed to solr/core/src/test/org/apache/solr/handler/admin/api/NodeHealthSolrCloudTest.java

@@ -31,7 +31,12 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-public class NodeHealthTest extends SolrCloudTestCase {
+/**
+ * Tests for the node-health API, on SolrCloud clusters
+ *
+ * @see NodeHealthStandaloneTest
+ */
+public class NodeHealthSolrCloudTest extends SolrCloudTestCase {
 
   @BeforeClass
   public static void setupCluster() throws Exception {
@@ -77,10 +82,7 @@ public void testCloudMode_UnhealthyWhenZkClientClosed() throws Exception {
       SolrException e =
           assertThrows(SolrException.class, () -> new NodeApi.Healthcheck().process(nodeClient));
       assertEquals(ErrorCode.SERVICE_UNAVAILABLE.code, e.code());
-      assertThat(
-          "Expected 'Host Unavailable' in exception message",
-          e.getMessage(),
-          containsString(("Host Unavailable")));
+      assertThat(e.getMessage(), containsString(("Host Unavailable")));
     } finally {
       newJetty.stop();
     }
@@ -119,10 +121,7 @@ public void testNotInLiveNodes_ThrowsServiceUnavailable() throws Exception {
       SolrException e =
           assertThrows(SolrException.class, () -> new NodeApi.Healthcheck().process(nodeClient));
       assertEquals(ErrorCode.SERVICE_UNAVAILABLE.code, e.code());
-      assertThat(
-          "Expected 'Not in live nodes' in exception message",
-          e.getMessage(),
-          containsString("Not in live nodes"));
+      assertThat(e.getMessage(), containsString("Not in live nodes"));
     } finally {
       newJetty.stop();
     }

solr/core/src/test/org/apache/solr/handler/admin/api/NodeHealthStandaloneTest.java

@@ -28,6 +28,11 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
+/**
+ * Tests for the node-health API, on Standalone Solr
+ *
+ * @see NodeHealthSolrCloudTest
+ */
 public class NodeHealthStandaloneTest extends SolrTestCaseJ4 {
 
   @ClassRule public static SolrJettyTestRule solrTestRule = new SolrJettyTestRule();
@@ -45,10 +50,7 @@ public void testWithoutMaxGenerationLagReturnsOk() throws Exception {
 
     assertNotNull(response);
     assertEquals(OK, response.status);
-    assertThat(
-        "Expected message about maxGenerationLag not being specified",
-        response.message,
-        containsString("maxGenerationLag isn't specified"));
+    assertThat(response.message, containsString("maxGenerationLag isn't specified"));
   }
 
   @Test
@@ -59,9 +61,6 @@ public void testWithNegativeMaxGenerationLagReturnsFailure() throws Exception {
 
     assertNotNull(response);
     assertEquals(FAILURE, response.status);
-    assertThat(
-        "Expected message about invalid maxGenerationLag",
-        response.message,
-        containsString("Invalid value of maxGenerationLag"));
+    assertThat(response.message, containsString("Invalid value of maxGenerationLag"));
   }
 }