apply spotless task

Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
opensearch-project · May 16, 2024 · 675a105 · 675a105
1 parent 92f2620
commit 675a105
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 172 deletions.
diff --git 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<String, Object> multiTenantLabels = searchRequest.source().multiTenantLabels();
         String tenant = NOT_PROVIDED;
-        if (multiTenantLabels != null) {
+        if (searchRequest.source() != null) {
+            Map<String, Object> 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
@@ -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
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupTests.java b/server/src/test/java/org/opensearch/cluster/metadata/ResourceLimitGroupTests.java
diff --git a/...ensearch/search/MultiTenantLabelTest.java → ...nsearch/search/MultiTenantLabelTests.java b/...ensearch/search/MultiTenantLabelTest.java → ...nsearch/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");