Rename class to match naming convention of other handlers

2 files changed, 14 insertions, 14 deletions

diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionHandler.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java
index ca720ec8b68..73859f385e1 100644
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionHandler.java
+++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandler.java
@@ -25,19 +25,19 @@ import java.util.stream.Collectors;
  * @author hakonhall
  * @author bjorncs
  */
-public class HostSuspensionHandler extends RestApiRequestHandler<HostSuspensionHandler> {
+public class HostSuspensionRequestHandler extends RestApiRequestHandler<HostSuspensionRequestHandler> {
 
-    private static final Logger log = Logger.getLogger(HostSuspensionHandler.class.getName());
+    private static final Logger log = Logger.getLogger(HostSuspensionRequestHandler.class.getName());
 
     private final Orchestrator orchestrator;
 
     @Inject
-    public HostSuspensionHandler(LoggingRequestHandler.Context context, Orchestrator orchestrator) {
-        super(context, HostSuspensionHandler::createRestApiDefinition);
+    public HostSuspensionRequestHandler(LoggingRequestHandler.Context context, Orchestrator orchestrator) {
+        super(context, HostSuspensionRequestHandler::createRestApiDefinition);
         this.orchestrator = orchestrator;
     }
 
-    private static RestApi createRestApiDefinition(HostSuspensionHandler self) {
+    private static RestApi createRestApiDefinition(HostSuspensionRequestHandler self) {
         return RestApi.builder()
                 .addRoute(RestApi.route("/orchestrator/v1/suspensions/hosts/{hostname}")
                     .put(self::suspendAll))
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionHandlerTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandlerTest.java
index be3cb047967..983c28eb2f9 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionHandlerTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostSuspensionRequestHandlerTest.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.when;
  * @author hakonhall
  * @author bjorncs
  */
-class HostSuspensionHandlerTest {
+class HostSuspensionRequestHandlerTest {
 
     private final Clock clock = mock(Clock.class);
 
@@ -45,14 +45,14 @@ class HostSuspensionHandlerTest {
 
     @Test
     void returns_200_on_success_batch() throws IOException {
-        HostSuspensionHandler handler = createHandler(HostRequestHandlerTest.createAlwaysAllowOrchestrator(clock));
+        HostSuspensionRequestHandler handler = createHandler(HostRequestHandlerTest.createAlwaysAllowOrchestrator(clock));
         HttpResponse response = executeSuspendAllRequest(handler, "parentHostname", List.of("hostname1", "hostname2"));
         assertSuccess(response);
     }
 
     @Test
     void returns_200_empty_batch() throws IOException {
-        HostSuspensionHandler handler = createHandler(HostRequestHandlerTest.createAlwaysAllowOrchestrator(clock));
+        HostSuspensionRequestHandler handler = createHandler(HostRequestHandlerTest.createAlwaysAllowOrchestrator(clock));
         HttpResponse response = executeSuspendAllRequest(handler, "parentHostname", List.of());
         assertSuccess(response);
     }
@@ -62,7 +62,7 @@ class HostSuspensionHandlerTest {
     // hostnames are part of the request body for multi-host.
     @Test
     void returns_400_when_host_unknown_for_batch() {
-        HostSuspensionHandler handler = createHandler(HostRequestHandlerTest.createHostNotFoundOrchestrator(clock));
+        HostSuspensionRequestHandler handler = createHandler(HostRequestHandlerTest.createHostNotFoundOrchestrator(clock));
         HttpResponse response = executeSuspendAllRequest(handler, "parentHostname", List.of("hostname1", "hostname2"));
         assertEquals(400, response.getStatus());
     }
@@ -70,7 +70,7 @@ class HostSuspensionHandlerTest {
     @Test
     void returns_409_when_request_rejected_by_policies_for_batch() {
         OrchestratorImpl alwaysRejectResolver = HostRequestHandlerTest.createAlwaysRejectResolver(clock);
-        HostSuspensionHandler handler = createHandler(alwaysRejectResolver);
+        HostSuspensionRequestHandler handler = createHandler(alwaysRejectResolver);
         HttpResponse response = executeSuspendAllRequest(handler, "parentHostname", List.of("hostname1", "hostname2"));
         assertEquals(409, response.getStatus());
     }
@@ -80,18 +80,18 @@ class HostSuspensionHandlerTest {
     void throws_409_on_suspendAll_timeout() throws BatchHostStateChangeDeniedException, BatchHostNameNotFoundException, BatchInternalErrorException {
         Orchestrator orchestrator = mock(Orchestrator.class);
         doThrow(new UncheckedTimeoutException("Timeout Message")).when(orchestrator).suspendAll(any(), any());
-        HostSuspensionHandler handler = createHandler(orchestrator);
+        HostSuspensionRequestHandler handler = createHandler(orchestrator);
         HttpResponse response = executeSuspendAllRequest(handler, "parenthost", List.of("h1", "h2", "h3"));
         assertEquals(409, response.getStatus());
     }
 
-    private static HostSuspensionHandler createHandler(Orchestrator orchestrator) {
-        return new HostSuspensionHandler(
+    private static HostSuspensionRequestHandler createHandler(Orchestrator orchestrator) {
+        return new HostSuspensionRequestHandler(
                 new LoggingRequestHandler.Context(Executors.newSingleThreadExecutor(), new MockMetric()),
                 orchestrator);
     }
 
-    private static HttpResponse executeSuspendAllRequest(HostSuspensionHandler handler, String parentHostname, List<String> hostnames) {
+    private static HttpResponse executeSuspendAllRequest(HostSuspensionRequestHandler handler, String parentHostname, List<String> hostnames) {
         StringBuilder uriBuilder = new StringBuilder("/orchestrator/v1/suspensions/hosts/").append(parentHostname);
         if (!hostnames.isEmpty()) {
             uriBuilder.append(hostnames.stream()