From 675a1050bef48de27b650825fcf09b64868d3afa Mon Sep 17 00:00:00 2001 From: Kaushal Kumar Date: Thu, 16 May 2024 10:07:53 -0700 Subject: [PATCH] apply spotless task Signed-off-by: Kaushal Kumar --- .../action/search/TransportSearchAction.java | 4 +- .../org/opensearch/search/SearchService.java | 2 +- .../ResourceLimitGroupMetadataTests.java | 47 ------- .../metadata/ResourceLimitGroupTests.java | 121 ------------------ ...elTest.java => MultiTenantLabelTests.java} | 2 +- 5 files changed, 4 insertions(+), 172 deletions(-) delete mode 100644 server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupMetadataTests.java delete mode 100644 server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupTests.java rename server/src/test/java/org/opensearch/search/{MultiTenantLabelTest.java => MultiTenantLabelTests.java} (95%) diff --git a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java index aec1703995b60..e621b01467859 100644 --- a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java +++ b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java @@ -1108,9 +1108,9 @@ private void executeSearch( ); // Set tenant for this request in the task for tracking the tasks across tenants - Map multiTenantLabels = searchRequest.source().multiTenantLabels(); String tenant = NOT_PROVIDED; - if (multiTenantLabels != null) { + if (searchRequest.source() != null) { + Map multiTenantLabels = searchRequest.source().multiTenantLabels(); tenant = (String) multiTenantLabels.get(MultiTenantLabel.TENANT.name()); } task.setResourceLimitGroupName(tenant); diff --git a/server/src/main/java/org/opensearch/search/SearchService.java b/server/src/main/java/org/opensearch/search/SearchService.java index d6eb1b81f594f..8b3dc068a4d05 100644 --- a/server/src/main/java/org/opensearch/search/SearchService.java +++ b/server/src/main/java/org/opensearch/search/SearchService.java @@ -602,7 +602,7 @@ public void onFailure(Exception exc) { private void setTenantInTask(SearchShardTask task, ShardSearchRequest request) { String tenant = NOT_PROVIDED; - if (request.source().multiTenantLabels() != null) { + if (request.source() != null && request.source().multiTenantLabels() != null) { tenant = (String) request.source().multiTenantLabels().get(MultiTenantLabel.TENANT.name()); } task.setResourceLimitGroupName(tenant); diff --git a/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupMetadataTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupMetadataTests.java deleted file mode 100644 index bccfc5ed8f386..0000000000000 --- a/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupMetadataTests.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ - -package org.opensearch.cluster.metadata; - -import org.opensearch.core.common.io.stream.NamedWriteableRegistry; -import org.opensearch.test.AbstractNamedWriteableTestCase; - -import java.util.Collections; -import java.util.Set; - -import static org.opensearch.cluster.metadata.ResourceLimitGroupTests.createRandomResourceLimitGroup; - -public class ResourceLimitGroupMetadataTests extends AbstractNamedWriteableTestCase { - - @Override - protected NamedWriteableRegistry getNamedWriteableRegistry() { - return new NamedWriteableRegistry( - Collections.singletonList( - new NamedWriteableRegistry.Entry( - ResourceLimitGroupMetadata.class, - ResourceLimitGroupMetadata.TYPE, - ResourceLimitGroupMetadata::new - ) - ) - ); - } - - @Override - protected Class categoryClass() { - return ResourceLimitGroupMetadata.class; - } - - @Override - protected ResourceLimitGroupMetadata createTestInstance() { - return new ResourceLimitGroupMetadata(getRandomResourceLimitGroups()); - } - - private Set getRandomResourceLimitGroups() { - return Set.of(createRandomResourceLimitGroup(), createRandomResourceLimitGroup()); - } -} diff --git a/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupTests.java deleted file mode 100644 index 273b082b227c2..0000000000000 --- a/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupTests.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * SPDX-License-Identifier: Apache-2.0 - * - * The OpenSearch Contributors require contributions made to - * this file be licensed under the Apache-2.0 license or a - * compatible open source license. - */ - -package org.opensearch.cluster.metadata; - -import org.opensearch.core.common.io.stream.Writeable; -import org.opensearch.core.xcontent.XContentParser; -import org.opensearch.test.AbstractSerializingTestCase; - -import java.io.IOException; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class ResourceLimitGroupTests extends AbstractSerializingTestCase { - - private static final List allowedModes = Stream.of( - ResourceLimitGroup.ResourceLimitGroupMode.SOFT, - ResourceLimitGroup.ResourceLimitGroupMode.ENFORCED, - ResourceLimitGroup.ResourceLimitGroupMode.MONITOR - ).map(ResourceLimitGroup.ResourceLimitGroupMode::getName).collect(Collectors.toList()); - - static ResourceLimitGroup createRandomResourceLimitGroup() { - String name = randomAlphaOfLength(10); - ResourceLimitGroup.ResourceLimit resourceLimit = new ResourceLimitGroup.ResourceLimit("jvm", randomDoubleBetween(0.0, 0.80, false)); - return new ResourceLimitGroup(name, List.of(resourceLimit), randomMode()); - } - - private static String randomMode() { - return allowedModes.get(randomIntBetween(0, allowedModes.size() - 1)); - } - - /** - * Parses to a new instance using the provided {@link XContentParser} - * - * @param parser - */ - @Override - protected ResourceLimitGroup doParseInstance(XContentParser parser) throws IOException { - return ResourceLimitGroup.fromXContent(parser); - } - - /** - * Returns a {@link Writeable.Reader} that can be used to de-serialize the instance - */ - @Override - protected Writeable.Reader instanceReader() { - return ResourceLimitGroup::new; - } - - /** - * Creates a random test instance to use in the tests. This method will be - * called multiple times during test execution and should return a different - * random instance each time it is called. - */ - @Override - protected ResourceLimitGroup createTestInstance() { - return createRandomResourceLimitGroup(); - } - - public void testNullName() { - assertThrows(NullPointerException.class, () -> new ResourceLimitGroup(null, List.of(), randomMode())); - } - - public void testNullResourceLimits() { - assertThrows(NullPointerException.class, () -> new ResourceLimitGroup("analytics", null, randomMode())); - } - - public void testEmptyResourceLimits() { - assertThrows(IllegalArgumentException.class, () -> new ResourceLimitGroup("analytics", List.of(), randomMode())); - } - - public void testIllegalResourceLimitGroupMode() { - assertThrows( - IllegalArgumentException.class, - () -> new ResourceLimitGroup("analytics", List.of(new ResourceLimitGroup.ResourceLimit("jvm", 0.4)), "buggy") - ); - } - - public void testInvalidResourceLimitWhenInvalidSystemResourceNameIsGiven() { - assertThrows( - IllegalArgumentException.class, - () -> new ResourceLimitGroup( - "analytics", - List.of(new ResourceLimitGroup.ResourceLimit("RequestRate", randomDoubleBetween(0.01, 0.8, false))), - randomMode() - ) - ); - } - - public void testInvalidResourceLimitWhenInvalidSystemResourceValueIsGiven() { - assertThrows( - IllegalArgumentException.class, - () -> new ResourceLimitGroup( - "analytics", - List.of(new ResourceLimitGroup.ResourceLimit("RequestRate", randomDoubleBetween(1.1, 1.8, false))), - randomMode() - ) - ); - } - - public void testValidResourceLimitGroup() { - ResourceLimitGroup resourceLimitGroup = new ResourceLimitGroup( - "analytics", - List.of(new ResourceLimitGroup.ResourceLimit("jvm", randomDoubleBetween(0.01, 0.8, false))), - randomMode() - ); - - assertNotNull(resourceLimitGroup.getName()); - assertEquals("analytics", resourceLimitGroup.getName()); - assertNotNull(resourceLimitGroup.getResourceLimits()); - assertFalse(resourceLimitGroup.getResourceLimits().isEmpty()); - assertEquals(1, resourceLimitGroup.getResourceLimits().size()); - assertTrue(allowedModes.contains(resourceLimitGroup.getMode().getName())); - } -} diff --git a/server/src/test/java/org/opensearch/search/MultiTenantLabelTest.java b/server/src/test/java/org/opensearch/search/MultiTenantLabelTests.java similarity index 95% rename from server/src/test/java/org/opensearch/search/MultiTenantLabelTest.java rename to server/src/test/java/org/opensearch/search/MultiTenantLabelTests.java index 18a79c6dc6ed9..6d215a8c775fe 100644 --- a/server/src/test/java/org/opensearch/search/MultiTenantLabelTest.java +++ b/server/src/test/java/org/opensearch/search/MultiTenantLabelTests.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -public class MultiTenantLabelTest extends AbstractSearchTestCase { +public class MultiTenantLabelTests extends AbstractSearchTestCase { public void testValidMultiTenantLabel() { MultiTenantLabel label = MultiTenantLabel.fromName("tenant");