Follow the existing naming pattern.

Author: epugh

solr/core/src/java/org/apache/solr/handler/admin/HealthCheckHandler.java

@@ -26,7 +26,7 @@
 import org.apache.solr.common.util.NamedList;
 import org.apache.solr.core.CoreContainer;
 import org.apache.solr.handler.RequestHandlerBase;
-import org.apache.solr.handler.admin.api.NodeHealthAPI;
+import org.apache.solr.handler.admin.api.NodeHealth;
 import org.apache.solr.handler.api.V2ApiUtils;
 import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.SolrQueryResponse;
@@ -59,7 +59,7 @@
  * <code>maxGenerationLag=&lt;max_generation_lag&gt;</code> request parameter. If <code>
  * maxGenerationLag</code> is not provided then health check would simply return OK.
  *
- * <p>All health-check logic lives in the v2 {@link NodeHealthAPI}; this handler is a thin v1 bridge
+ * <p>All health-check logic lives in the v2 {@link NodeHealth}; this handler is a thin v1 bridge
  * that extracts request parameters and delegates.
  */
 public class HealthCheckHandler extends RequestHandlerBase {
@@ -86,8 +86,7 @@ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throw
     final Integer maxGenerationLag =
         req.getParams().getInt(HealthCheckRequest.PARAM_MAX_GENERATION_LAG);
     V2ApiUtils.squashIntoSolrResponseWithoutHeader(
-        rsp,
-        new NodeHealthAPI(coreContainer).checkNodeHealth(requireHealthyCores, maxGenerationLag));
+        rsp, new NodeHealth(coreContainer).checkNodeHealth(requireHealthyCores, maxGenerationLag));
   }
 
   @Override
@@ -112,7 +111,7 @@ public Collection<Api> getApis() {
 
   @Override
   public Collection<Class<? extends JerseyResource>> getJerseyResources() {
-    return List.of(NodeHealthAPI.class);
+    return List.of(NodeHealth.class);
   }
 
   @Override

…olr/handler/admin/api/NodeHealthAPI.java …e/solr/handler/admin/api/NodeHealth.javasolr/core/src/java/org/apache/solr/handler/admin/api/NodeHealthAPI.java renamed to solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealth.java solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealthAPI.java renamed to solr/core/src/java/org/apache/solr/handler/admin/api/NodeHealth.java

@@ -58,15 +58,15 @@
  *
  * <p>The v1 {@link org.apache.solr.handler.admin.HealthCheckHandler} delegates to this class.
  */
-public class NodeHealthAPI extends JerseyResource implements NodeHealthApi {
+public class NodeHealth extends JerseyResource implements NodeHealthApi {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private static final List<State> UNHEALTHY_STATES = Arrays.asList(State.DOWN, State.RECOVERING);
 
   private final CoreContainer coreContainer;
 
   @Inject
-  public NodeHealthAPI(CoreContainer coreContainer) {
+  public NodeHealth(CoreContainer coreContainer) {
     this.coreContainer = coreContainer;
   }
 

solr/core/src/test/org/apache/solr/handler/admin/HealthCheckHandlerTest.java

@@ -42,7 +42,7 @@
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.core.CoreDescriptor;
 import org.apache.solr.embedded.JettySolrRunner;
-import org.apache.solr.handler.admin.api.NodeHealthAPI;
+import org.apache.solr.handler.admin.api.NodeHealth;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -152,7 +152,7 @@ public void testFindUnhealthyCores() {
               mockCD("invalid", "invalid", "slice1", false, Replica.State.RECOVERING),
               // A core for a slice that is not an active slice will not fail the check
               mockCD("collection1", "invalid_replica1", "invalid", true, Replica.State.DOWN));
-      long unhealthy1 = NodeHealthAPI.findUnhealthyCores(node1Cores, clusterState);
+      long unhealthy1 = NodeHealth.findUnhealthyCores(node1Cores, clusterState);
       assertEquals(2, unhealthy1);
 
       // Node 2
@@ -162,7 +162,7 @@ public void testFindUnhealthyCores() {
               mockCD("collection1", "slice1_replica4", "slice1", true, Replica.State.DOWN),
               mockCD(
                   "collection2", "slice1_replica1", "slice1", true, Replica.State.RECOVERY_FAILED));
-      long unhealthy2 = NodeHealthAPI.findUnhealthyCores(node2Cores, clusterState);
+      long unhealthy2 = NodeHealth.findUnhealthyCores(node2Cores, clusterState);
       assertEquals(1, unhealthy2);
     }
   }

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

@@ -32,7 +32,7 @@
 import org.junit.ClassRule;
 import org.junit.Test;
 
-public class NodeHealthAPITest extends SolrCloudTestCase {
+public class NodeHealthTest extends SolrCloudTestCase {
 
   /**
    * A standalone (non-ZooKeeper) Jetty instance used by the legacy-mode tests. The
@@ -107,12 +107,12 @@ public void testLegacyMode_WithoutMaxGenerationLagReturnsOk() throws Exception {
 
   @Test
   public void testLegacyMode_WithNegativeMaxGenerationLagReturnsFailure() {
-    // maxGenerationLag is a v1-only parameter: NodeHealthAPI.healthcheck() (v2) hardcodes it to
+    // maxGenerationLag is a v1-only parameter: NodeHealth.healthcheck() (v2) hardcodes it to
     // null and never forwards it from request params. NodeApi.Healthcheck therefore cannot be used
     // to exercise this code path, so we call the JAX-RS implementation directly.
     // FIXME: IInteresting!  Do we have a gap?
     final var response =
-        new NodeHealthAPI(standaloneJetty.getCoreContainer()).checkNodeHealth(null, -1);
+        new NodeHealth(standaloneJetty.getCoreContainer()).checkNodeHealth(null, -1);
 
     assertNotNull(response);
     assertEquals(FAILURE, response.status);