From da1fe8c8a4dc45a41ff643635c8dbb4d7cddbf5f Mon Sep 17 00:00:00 2001 From: Ruirui Zhang Date: Tue, 9 Jul 2024 13:04:38 -0700 Subject: [PATCH] remove wildcard imports Signed-off-by: Ruirui Zhang --- .../wlm/action/CreateQueryGroupRequest.java | 5 ++-- .../service/QueryGroupPersistenceService.java | 2 +- .../wlm/action/QueryGroupTestUtils.java | 23 ++++++++------- .../QueryGroupPersistenceServiceTests.java | 28 +++++++++++++++---- .../cluster/metadata/QueryGroup.java | 2 +- .../common/settings/ClusterSettings.java | 2 +- 6 files changed, 40 insertions(+), 22 deletions(-) diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateQueryGroupRequest.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateQueryGroupRequest.java index 2ce70ed8ac931..6057c78b1b0ea 100644 --- a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateQueryGroupRequest.java +++ b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/CreateQueryGroupRequest.java @@ -12,18 +12,17 @@ import org.opensearch.action.ActionRequestValidationException; import org.opensearch.cluster.metadata.QueryGroup; import org.opensearch.cluster.metadata.QueryGroup.ResiliencyMode; - import org.opensearch.common.UUIDs; import org.opensearch.core.common.io.stream.StreamInput; import org.opensearch.core.common.io.stream.StreamOutput; import org.opensearch.core.common.io.stream.Writeable; import org.opensearch.core.xcontent.XContentParser; -import org.joda.time.Instant; import org.opensearch.search.ResourceType; +import org.joda.time.Instant; import java.io.IOException; -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * A request for create QueryGroup diff --git a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceService.java b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceService.java index fb1862d045b7b..895938ae9f7da 100644 --- a/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceService.java +++ b/plugins/workload-management/src/main/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceService.java @@ -129,7 +129,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS * @param resourceLimits - the resource limit from which to get the allocation value for resourceName */ private double getResourceLimitValue(String resourceName, final Map resourceLimits) { - for (ResourceType resourceType: resourceLimits.keySet()) { + for (ResourceType resourceType : resourceLimits.keySet()) { if (resourceType.getName().equals(resourceName)) { return (double) resourceLimits.get(resourceType); } diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/QueryGroupTestUtils.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/QueryGroupTestUtils.java index fce686d257af4..aea3c361298c0 100644 --- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/QueryGroupTestUtils.java +++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/QueryGroupTestUtils.java @@ -19,14 +19,17 @@ import org.opensearch.search.ResourceType; import org.opensearch.threadpool.ThreadPool; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.DoubleAdder; import static org.opensearch.cluster.metadata.QueryGroup.builder; +import static org.opensearch.search.ResourceType.fromName; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; -import static org.opensearch.search.ResourceType.fromName; public class QueryGroupTestUtils { public static final String NAME_ONE = "query_group_one"; @@ -96,14 +99,14 @@ public static List prepareSandboxPersistenceService(Map resourceLimitMapOne, Map resourceLimitMapTwo) { assertTrue(resourceLimitMapOne.keySet().containsAll(resourceLimitMapTwo.keySet())); assertTrue(resourceLimitMapOne.values().containsAll(resourceLimitMapTwo.values())); -// for (Map.Entry entryOne : resourceLimitMapOne.entrySet()) { -// String resourceName = entryOne.getKey().getName(); -// Optional> entryTwo = resourceLimitMapTwo.entrySet().stream() -// .filter(e -> e.getKey().getName().equals(resourceName)) -// .findFirst(); -// assertTrue(entryTwo.isPresent()); -// assertEquals(entryOne.getValue(), entryTwo.get().getValue()); -// } + // for (Map.Entry entryOne : resourceLimitMapOne.entrySet()) { + // String resourceName = entryOne.getKey().getName(); + // Optional> entryTwo = resourceLimitMapTwo.entrySet().stream() + // .filter(e -> e.getKey().getName().equals(resourceName)) + // .findFirst(); + // assertTrue(entryTwo.isPresent()); + // assertEquals(entryOne.getValue(), entryTwo.get().getValue()); + // } } public static void compareResourceLimits(Map resourceLimitMapOne, Map resourceLimitMapTwo) { diff --git a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceServiceTests.java b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceServiceTests.java index c37da96b7ebad..c6b20f8928c62 100644 --- a/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceServiceTests.java +++ b/plugins/workload-management/src/test/java/org/opensearch/plugin/wlm/action/service/QueryGroupPersistenceServiceTests.java @@ -19,12 +19,28 @@ import org.opensearch.test.OpenSearchTestCase; import org.opensearch.threadpool.ThreadPool; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static org.opensearch.cluster.metadata.QueryGroup.builder; -import static org.mockito.Mockito.mock; -import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.*; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.MEMORY_STRING; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.MONITOR_STRING; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.NAME_NONE_EXISTED; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.NAME_ONE; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.NAME_TWO; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils._ID_ONE; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.assertInflightValuesAreZero; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.compareQueryGroups; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.prepareSandboxPersistenceService; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.queryGroupList; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.queryGroupOne; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.queryGroupPersistenceService; +import static org.opensearch.plugin.wlm.action.QueryGroupTestUtils.queryGroupTwo; import static org.opensearch.search.query_group.QueryGroupServiceSettings.QUERY_GROUP_COUNT_SETTING_NAME; +import static org.mockito.Mockito.mock; public class QueryGroupPersistenceServiceTests extends OpenSearchTestCase { @@ -63,7 +79,7 @@ public void testCreateQueryGroupDuplicateName() { QueryGroup toCreate = builder().name(NAME_ONE) ._id("W5iIqHyhgi4K1qIAAAAIHw==") .mode(MONITOR_STRING) - .resourceLimits(Map.of(ResourceType.fromName(MEMORY_STRING), 0.3)) + .resourceLimits(Map.of(ResourceType.fromName(MEMORY_STRING), 0.3)) .updatedAt(1690934400000L) .build(); assertThrows(RuntimeException.class, () -> queryGroupPersistenceService1.saveQueryGroupInClusterState(toCreate, clusterState)); @@ -74,7 +90,7 @@ public void testCreateQueryGroupOverflowAllocation() { QueryGroup toCreate = builder().name(NAME_TWO) ._id("W5iIqHyhgi4K1qIAAAAIHw==") .mode(MONITOR_STRING) - .resourceLimits(Map.of(ResourceType.fromName(MEMORY_STRING), 0.5)) + .resourceLimits(Map.of(ResourceType.fromName(MEMORY_STRING), 0.5)) .updatedAt(1690934400000L) .build(); QueryGroupPersistenceService queryGroupPersistenceService1 = (QueryGroupPersistenceService) setup.get(0); @@ -86,7 +102,7 @@ public void testCreateQueryGroupOverflowCount() { QueryGroup toCreate = builder().name(NAME_NONE_EXISTED) ._id("W5iIqHyhgi4K1qIAAAAIHw==") .mode(MONITOR_STRING) - .resourceLimits(Map.of(ResourceType.fromName(MEMORY_STRING), 0.5)) + .resourceLimits(Map.of(ResourceType.fromName(MEMORY_STRING), 0.5)) .updatedAt(1690934400000L) .build(); Metadata metadata = Metadata.builder().queryGroups(Map.of(NAME_ONE, queryGroupOne, NAME_TWO, queryGroupTwo)).build(); diff --git a/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java b/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java index 8677e28d6b257..9df5cf73e57ed 100644 --- a/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java +++ b/server/src/main/java/org/opensearch/cluster/metadata/QueryGroup.java @@ -206,6 +206,7 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; QueryGroup that = (QueryGroup) o; return Objects.equals(name, that.name) + && Objects.equals(resiliencyMode, that.resiliencyMode) && Objects.equals(resourceLimits, that.resourceLimits) && Objects.equals(_id, that._id) && updatedAtInMillis == that.updatedAtInMillis; @@ -273,7 +274,6 @@ public static ResiliencyMode fromName(String s) { } throw new IllegalArgumentException("Invalid value for QueryGroupMode: " + s); } - } /** diff --git a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java index a40e33e632d58..9ee69c1428d83 100644 --- a/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java +++ b/server/src/main/java/org/opensearch/common/settings/ClusterSettings.java @@ -157,8 +157,8 @@ import org.opensearch.search.backpressure.settings.SearchBackpressureSettings; import org.opensearch.search.backpressure.settings.SearchShardTaskSettings; import org.opensearch.search.backpressure.settings.SearchTaskSettings; -import org.opensearch.search.query_group.QueryGroupServiceSettings; import org.opensearch.search.fetch.subphase.highlight.FastVectorHighlighter; +import org.opensearch.search.query_group.QueryGroupServiceSettings; import org.opensearch.snapshots.InternalSnapshotsInfoService; import org.opensearch.snapshots.SnapshotsService; import org.opensearch.tasks.TaskCancellationMonitoringSettings;