From ca37873719f9af14a2571ce971eb5c117d159a7a Mon Sep 17 00:00:00 2001 From: Kaushal Kumar Date: Mon, 26 Aug 2024 13:05:14 -0700 Subject: [PATCH] apply spotless check Signed-off-by: Kaushal Kumar --- .../src/main/java/org/opensearch/node/Node.java | 16 +++++++++++----- .../org/opensearch/wlm/QueryGroupService.java | 4 ++-- .../WorkloadManagementTransportInterceptor.java | 3 +-- ...adManagementTransportRequestHandlerTests.java | 5 ++++- ...upRequestRejectionOperationListenerTests.java | 1 - 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java index d302764fefab2..12e50577f5fb7 100644 --- a/server/src/main/java/org/opensearch/node/Node.java +++ b/server/src/main/java/org/opensearch/node/Node.java @@ -1013,16 +1013,22 @@ protected Node( // Add the telemetryAwarePlugin components to the existing pluginComponents collection. pluginComponents.addAll(telemetryAwarePluginComponents); - final QueryGroupRequestRejectionOperationListener queryGroupRequestRejectionListener = new QueryGroupRequestRejectionOperationListener( - new QueryGroupService(), // We will need to replace this with actual instance of the queryGroupService - threadPool - ); + final QueryGroupRequestRejectionOperationListener queryGroupRequestRejectionListener = + new QueryGroupRequestRejectionOperationListener( + new QueryGroupService(), // We will need to replace this with actual instance of the queryGroupService + threadPool + ); // register all standard SearchRequestOperationsCompositeListenerFactory to the SearchRequestOperationsCompositeListenerFactory final SearchRequestOperationsCompositeListenerFactory searchRequestOperationsCompositeListenerFactory = new SearchRequestOperationsCompositeListenerFactory( Stream.concat( - Stream.of(searchRequestStats, searchRequestSlowLog, searchTaskRequestOperationsListener, queryGroupRequestRejectionListener), + Stream.of( + searchRequestStats, + searchRequestSlowLog, + searchTaskRequestOperationsListener, + queryGroupRequestRejectionListener + ), pluginComponents.stream() .filter(p -> p instanceof SearchRequestOperationsListener) .map(p -> (SearchRequestOperationsListener) p) diff --git a/server/src/main/java/org/opensearch/wlm/QueryGroupService.java b/server/src/main/java/org/opensearch/wlm/QueryGroupService.java index 12c5399b08ba5..6ba286d68670b 100644 --- a/server/src/main/java/org/opensearch/wlm/QueryGroupService.java +++ b/server/src/main/java/org/opensearch/wlm/QueryGroupService.java @@ -30,8 +30,8 @@ public void requestFailedFor(final String queryGroupId) { public Optional shouldRejectFor(String queryGroupId) { if (queryGroupId == null) return Optional.empty(); // TODO: At this point this is dummy and we need to decide whether to cancel the request based on last - // reported resource usage for the queryGroup. We also need to increment the rejection count here for the - // query group + // reported resource usage for the queryGroup. We also need to increment the rejection count here for the + // query group return Optional.of("Possible reason. "); } } diff --git a/server/src/main/java/org/opensearch/wlm/WorkloadManagementTransportInterceptor.java b/server/src/main/java/org/opensearch/wlm/WorkloadManagementTransportInterceptor.java index fac0e7ac484c6..6bc66f1c5c04e 100644 --- a/server/src/main/java/org/opensearch/wlm/WorkloadManagementTransportInterceptor.java +++ b/server/src/main/java/org/opensearch/wlm/WorkloadManagementTransportInterceptor.java @@ -50,8 +50,7 @@ public static class RequestHandler implements Transp TransportRequestHandler actualHandler; private final QueryGroupService queryGroupService; - public RequestHandler(ThreadPool threadPool, TransportRequestHandler actualHandler, - QueryGroupService queryGroupService) { + public RequestHandler(ThreadPool threadPool, TransportRequestHandler actualHandler, QueryGroupService queryGroupService) { this.threadPool = threadPool; this.actualHandler = actualHandler; this.queryGroupService = queryGroupService; diff --git a/server/src/test/java/org/opensearch/wlm/WorkloadManagementTransportRequestHandlerTests.java b/server/src/test/java/org/opensearch/wlm/WorkloadManagementTransportRequestHandlerTests.java index 8ac321b211b79..a06f44da7078f 100644 --- a/server/src/test/java/org/opensearch/wlm/WorkloadManagementTransportRequestHandlerTests.java +++ b/server/src/test/java/org/opensearch/wlm/WorkloadManagementTransportRequestHandlerTests.java @@ -22,7 +22,10 @@ import java.util.Collections; import java.util.Optional; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyString; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; public class WorkloadManagementTransportRequestHandlerTests extends OpenSearchTestCase { private WorkloadManagementTransportInterceptor.RequestHandler sut; diff --git a/server/src/test/java/org/opensearch/wlm/listeners/QueryGroupRequestRejectionOperationListenerTests.java b/server/src/test/java/org/opensearch/wlm/listeners/QueryGroupRequestRejectionOperationListenerTests.java index 11d25e13ba0ba..77a699fecd13a 100644 --- a/server/src/test/java/org/opensearch/wlm/listeners/QueryGroupRequestRejectionOperationListenerTests.java +++ b/server/src/test/java/org/opensearch/wlm/listeners/QueryGroupRequestRejectionOperationListenerTests.java @@ -25,7 +25,6 @@ public class QueryGroupRequestRejectionOperationListenerTests extends OpenSearch QueryGroupService queryGroupService; QueryGroupRequestRejectionOperationListener sut; - public void setUp() throws Exception { super.setUp(); testThreadPool = new TestThreadPool("RejectionTestThreadPool");