code refactoring and spotless checks

Signed-off-by: Shubh Sahu <shubhvs@amazon.com>
opensearch-project · Apr 1, 2024 · 872f742 · 872f742
1 parent f262296
commit 872f742
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/...internalClusterTest/java/org/opensearch/remotemigration/ResizeIndexMigrationTestCase.java b/...internalClusterTest/java/org/opensearch/remotemigration/ResizeIndexMigrationTestCase.java
@@ -14,7 +14,6 @@
 import org.opensearch.client.Client;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.indices.replication.common.ReplicationType;
-import org.opensearch.node.remotestore.RemoteStoreNodeService;
 import org.opensearch.test.OpenSearchIntegTestCase;
 
 import java.util.List;
@@ -137,7 +136,6 @@ public void testFailResizeIndexWhileRemoteStoreToDocRepMigration() throws Except
         addRemote = false;
         String nonRemoteNodeName = internalCluster().startNode();
 
-
         logger.info("-->Create index on remote node and SETTING_REMOTE_STORE_ENABLED is true. Resize should not happen");
         Settings.Builder builder = Settings.builder().put(SETTING_REPLICATION_TYPE, ReplicationType.SEGMENT);
         client.admin()

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shrink/TransportResizeAction.java b/server/src/main/java/org/opensearch/action/admin/indices/shrink/TransportResizeAction.java
@@ -382,10 +382,11 @@ private static void validateClusterModeSettings(
         if (clusterSettings.get(RemoteStoreNodeService.REMOTE_STORE_COMPATIBILITY_MODE_SETTING)
             .equals(RemoteStoreNodeService.CompatibilityMode.MIXED)) {
             boolean isRemoteStoreEnabled = sourceIndexMetadata.getSettings().getAsBoolean(SETTING_REMOTE_STORE_ENABLED, false);
-            if ((clusterSettings.get(RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING).equals(RemoteStoreNodeService.Direction.REMOTE_STORE)
+            if ((clusterSettings.get(RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING)
+                .equals(RemoteStoreNodeService.Direction.REMOTE_STORE)
                 && isRemoteStoreEnabled == false)
                 || (clusterSettings.get(RemoteStoreNodeService.MIGRATION_DIRECTION_SETTING).equals(RemoteStoreNodeService.Direction.DOCREP)
-                && isRemoteStoreEnabled == true)) {
+                    && isRemoteStoreEnabled == true)) {
                 throw new IllegalStateException(
                     "index Resizing for type ["
                         + type

diff --git a/.../src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java b/.../src/test/java/org/opensearch/action/admin/indices/shrink/TransportResizeActionTests.java
@@ -667,7 +667,7 @@ public void testResizeFailuresDuringMigration() {
 
         if (compatibilityMode == CompatibilityMode.MIXED) {
             if ((migrationDirection == RemoteStoreNodeService.Direction.REMOTE_STORE && isRemoteStoreEnabled == false)
-                || migrationDirection == RemoteStoreNodeService.Direction.DOCREP && isRemoteStoreEnabled == true ){
+                || migrationDirection == RemoteStoreNodeService.Direction.DOCREP && isRemoteStoreEnabled == true) {
                 ClusterState finalState = clusterState;
                 IllegalStateException ise = expectThrows(
                     IllegalStateException.class,