diff --git a/server/src/main/java/org/opensearch/gateway/AsyncBatchShardFetch.java b/server/src/main/java/org/opensearch/gateway/AsyncBatchShardFetch.java
index 0d9272d0d5689..994631d4bf026 100644
--- a/server/src/main/java/org/opensearch/gateway/AsyncBatchShardFetch.java
+++ b/server/src/main/java/org/opensearch/gateway/AsyncBatchShardFetch.java
@@ -37,7 +37,6 @@
 import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyMap;
-import static java.util.Collections.emptySet;
 import static java.util.Collections.unmodifiableSet;
 
 public abstract class AsyncBatchShardFetch<T extends BaseNodeResponse> implements Releasable {
@@ -46,13 +45,13 @@ public abstract class AsyncBatchShardFetch<T extends BaseNodeResponse> implement
      * An action that lists the relevant shard data that needs to be fetched.
      */
     public interface Lister<NodesResponse extends BaseNodesResponse<NodeResponse>, NodeResponse extends BaseNodeResponse> {
-        void list(DiscoveryNode[] nodes,Map<ShardId, String> shardIdsWithCustomDataPath, ActionListener<NodesResponse> listener);
+        void list(DiscoveryNode[] nodes, Map<ShardId, String> shardIdsWithCustomDataPath, ActionListener<NodesResponse> listener);
     }
 
     protected final Logger logger;
     protected final String type;
     private final String batchUUID;
-    protected Map<ShardId,String> shardsToCustomDataPathMap;
+    protected Map<ShardId, String> shardsToCustomDataPathMap;
     private Map<ShardId, Set<String>> ignoredShardToNodes = new HashMap<>();
     private final AsyncBatchShardFetch.Lister<BaseNodesResponse<T>, T> action;
     private final Map<String, AsyncBatchShardFetch.NodeEntry<T>> cache = new HashMap<>();
@@ -362,7 +361,7 @@ public Map<DiscoveryNode, T> getData() {
          * Process any changes needed to the allocation based on this fetch result.
          */
         public void processAllocation(RoutingAllocation allocation) {
-            for(Map.Entry<ShardId, Set<String>> entry : ignoredShardToNodes.entrySet()) {
+            for (Map.Entry<ShardId, Set<String>> entry : ignoredShardToNodes.entrySet()) {
                 ShardId shardId = entry.getKey();
                 Set<String> ignoreNodes = entry.getValue();
                 if (ignoreNodes.isEmpty() == false) {
diff --git a/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java b/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
index 6dc7011a31f3b..794aacb0c2fd1 100644
--- a/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
+++ b/server/src/main/java/org/opensearch/gateway/AsyncShardFetch.java
@@ -83,7 +83,7 @@ public interface Lister<NodesResponse extends BaseNodesResponse<NodeResponse>, N
     protected final Logger logger;
     protected final String type;
 
-    protected final Map<ShardId,String> shardToCustomDataPath;
+    protected final Map<ShardId, String> shardToCustomDataPath;
     private final Lister<BaseNodesResponse<T>, T> action;
     private final Map<String, NodeEntry<T>> cache = new HashMap<>();
     private final AtomicLong round = new AtomicLong();
@@ -103,7 +103,7 @@ protected AsyncShardFetch(
     ) {
         this.logger = logger;
         this.type = type;
-        shardToCustomDataPath =new HashMap<>();
+        shardToCustomDataPath = new HashMap<>();
         shardToCustomDataPath.put(shardId, customDataPath);
         this.action = (Lister<BaseNodesResponse<T>, T>) action;
         this.logKey = "ShardId=[" + shardId.toString() + "]";
@@ -122,11 +122,10 @@ protected AsyncShardFetch(
         this.type = type;
         this.shardToCustomDataPath = shardToCustomDataPath;
         this.action = (Lister<BaseNodesResponse<T>, T>) action;
-        this.logKey = "BatchID=[" + batchId+ "]";
+        this.logKey = "BatchID=[" + batchId + "]";
         enableBatchMode = true;
     }
 
-
     @Override
     public synchronized void close() {
         this.closed = true;
@@ -157,11 +156,12 @@ public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Map<ShardId,
             throw new IllegalStateException(logKey + ": can't fetch data on closed async fetch");
         }
 
-        if(enableBatchMode == false){
+        if (enableBatchMode == false) {
             // we will do assertions here on ignoreNodes
-            assert ignoreNodes.size() <=1 : "Can only have at-most one shard";
-            if(ignoreNodes.size() == 1) {
-                assert shardToCustomDataPath.containsKey(ignoreNodes.keySet().iterator().next()) : "ShardId should be same as initialised in fetcher";
+            assert ignoreNodes.size() <= 1 : "Can only have at-most one shard";
+            if (ignoreNodes.size() == 1) {
+                assert shardToCustomDataPath.containsKey(ignoreNodes.keySet().iterator().next())
+                    : "ShardId should be same as initialised in fetcher";
             }
         }
 
@@ -221,9 +221,16 @@ public synchronized FetchResult<T> fetchData(DiscoveryNodes nodes, Map<ShardId,
             shardToIgnoreNodes.clear();
             // if at least one node failed, make sure to have a protective reroute
             // here, just case this round won't find anything, and we need to retry fetching data
-            if (failedNodes.isEmpty() == false || allIgnoreNodesMap.values().stream().anyMatch(ignoreNodeSet -> ignoreNodeSet.isEmpty() == false)) {
-                reroute(logKey, "nodes failed [" + failedNodes.size() + "], ignored ["
-                    + allIgnoreNodesMap.values().stream().mapToInt(Set::size).sum() + "]");
+            if (failedNodes.isEmpty() == false
+                || allIgnoreNodesMap.values().stream().anyMatch(ignoreNodeSet -> ignoreNodeSet.isEmpty() == false)) {
+                reroute(
+                    logKey,
+                    "nodes failed ["
+                        + failedNodes.size()
+                        + "], ignored ["
+                        + allIgnoreNodesMap.values().stream().mapToInt(Set::size).sum()
+                        + "]"
+                );
             }
 
             return new FetchResult<>(fetchData, allIgnoreNodesMap);
@@ -398,13 +405,13 @@ public void onFailure(Exception e) {
      */
     public static class FetchResult<T extends BaseNodeResponse> {
 
-    private final Map<DiscoveryNode, T> data;
-    private final Map<ShardId, Set<String>> ignoredShardToNodes;
+        private final Map<DiscoveryNode, T> data;
+        private final Map<ShardId, Set<String>> ignoredShardToNodes;
 
-    public FetchResult(Map<DiscoveryNode, T> data, Map<ShardId, Set<String>> ignoreNodes) {
-        this.data = data;
-        this.ignoredShardToNodes = ignoreNodes;
-    }
+        public FetchResult(Map<DiscoveryNode, T> data, Map<ShardId, Set<String>> ignoreNodes) {
+            this.data = data;
+            this.ignoredShardToNodes = ignoreNodes;
+        }
 
         /**
          * Does the result actually contain data? If not, then there are on going fetch
@@ -423,20 +430,20 @@ public Map<DiscoveryNode, T> getData() {
             return this.data;
         }
 
-    /**
-     * Process any changes needed to the allocation based on this fetch result.
-     */
-    public void processAllocation(RoutingAllocation allocation) {
-        for(Map.Entry<ShardId, Set<String>> entry : ignoredShardToNodes.entrySet()) {
-            ShardId shardId = entry.getKey();
-            Set<String> ignoreNodes = entry.getValue();
-            if (ignoreNodes.isEmpty() == false) {
-                ignoreNodes.forEach(nodeId -> allocation.addIgnoreShardForNode(shardId, nodeId));
+        /**
+         * Process any changes needed to the allocation based on this fetch result.
+         */
+        public void processAllocation(RoutingAllocation allocation) {
+            for (Map.Entry<ShardId, Set<String>> entry : ignoredShardToNodes.entrySet()) {
+                ShardId shardId = entry.getKey();
+                Set<String> ignoreNodes = entry.getValue();
+                if (ignoreNodes.isEmpty() == false) {
+                    ignoreNodes.forEach(nodeId -> allocation.addIgnoreShardForNode(shardId, nodeId));
+                }
             }
-        }
 
+        }
     }
-}
 
     /**
      * A node entry, holding the state of the fetched data for a specific shard
diff --git a/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java b/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java
index 81a205f5a9235..e74cb375a3bc4 100644
--- a/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java
+++ b/server/src/main/java/org/opensearch/gateway/GatewayAllocator.java
@@ -270,6 +270,7 @@ protected void reroute(String logKey, String reason) {
             );
         }
     }
+
     class InternalPrimaryShardAllocator extends PrimaryShardAllocator {
 
         private final TransportNodesListGatewayStartedShards startedAction;
@@ -295,9 +296,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.Nod
             );
             AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.NodeGatewayStartedShards> shardState = fetch.fetchData(
                 allocation.nodes(),
-                new HashMap<>() {{
-                    put(shard.shardId(), allocation.getIgnoreNodes(shard.shardId()));
-                }}
+                new HashMap<>() {
+                    {
+                        put(shard.shardId(), allocation.getIgnoreNodes(shard.shardId()));
+                    }
+                }
             );
 
             if (shardState.hasData()) {
@@ -332,9 +335,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetadata.NodeS
             );
             AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetadata.NodeStoreFilesMetadata> shardStores = fetch.fetchData(
                 allocation.nodes(),
-                new HashMap<>() {{
-                    put(shard.shardId(), allocation.getIgnoreNodes(shard.shardId()));
-                }}
+                new HashMap<>() {
+                    {
+                        put(shard.shardId(), allocation.getIgnoreNodes(shard.shardId()));
+                    }
+                }
             );
             if (shardStores.hasData()) {
                 shardStores.processAllocation(allocation);
diff --git a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
index 61ae5e62b8a83..0abbb497039d9 100644
--- a/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
+++ b/server/src/main/java/org/opensearch/gateway/TransportNodesListGatewayStartedShards.java
@@ -125,7 +125,11 @@ public TransportNodesListGatewayStartedShards(
     }
 
     @Override
-    public void list(Map<ShardId, String> shardIdsWithCustomDataPath, DiscoveryNode[] nodes, ActionListener<NodesGatewayStartedShards> listener) {
+    public void list(
+        Map<ShardId, String> shardIdsWithCustomDataPath,
+        DiscoveryNode[] nodes,
+        ActionListener<NodesGatewayStartedShards> listener
+    ) {
         assert shardIdsWithCustomDataPath.size() == 1 : "only one shard should be specified";
         final ShardId shardId = shardIdsWithCustomDataPath.keySet().iterator().next();
         final String customDataPath = shardIdsWithCustomDataPath.get(shardId);
diff --git a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
index e2447a1c5612c..32e792169a811 100644
--- a/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
+++ b/server/src/main/java/org/opensearch/indices/store/TransportNodesListShardStoreMetadata.java
@@ -126,8 +126,12 @@ public TransportNodesListShardStoreMetadata(
     }
 
     @Override
-    public void list(Map<ShardId, String> shardIdsWithCustomDataPath, DiscoveryNode[] nodes, ActionListener<NodesStoreFilesMetadata> listener) {
-        assert shardIdsWithCustomDataPath.size() == 1 :  "only one shard should be specified";
+    public void list(
+        Map<ShardId, String> shardIdsWithCustomDataPath,
+        DiscoveryNode[] nodes,
+        ActionListener<NodesStoreFilesMetadata> listener
+    ) {
+        assert shardIdsWithCustomDataPath.size() == 1 : "only one shard should be specified";
         final ShardId shardId = shardIdsWithCustomDataPath.keySet().iterator().next();
         final String customDataPath = shardIdsWithCustomDataPath.get(shardId);
         execute(new Request(shardId, customDataPath, nodes), listener);
diff --git a/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java b/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java
index c1da9575d4a83..21c16eb3cbc6d 100644
--- a/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java
+++ b/server/src/test/java/org/opensearch/gateway/PrimaryShardAllocatorTests.java
@@ -850,9 +850,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListGatewayStartedShards.Nod
             ShardRouting shard,
             RoutingAllocation allocation
         ) {
-            return new AsyncShardFetch.FetchResult<>( data, new HashMap<>(){{
-                put(shardId, Collections.<String>emptySet());
-            }});
+            return new AsyncShardFetch.FetchResult<>(data, new HashMap<>() {
+                {
+                    put(shardId, Collections.<String>emptySet());
+                }
+            });
         }
     }
 }
diff --git a/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java b/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java
index f32f541f5ba4e..dc28315465c02 100644
--- a/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java
+++ b/server/src/test/java/org/opensearch/gateway/ReplicaShardAllocatorTests.java
@@ -727,9 +727,11 @@ protected AsyncShardFetch.FetchResult<TransportNodesListShardStoreMetadata.NodeS
                     );
                 }
             }
-            return new AsyncShardFetch.FetchResult<>(tData, new HashMap<>(){{
-                put(shardId, Collections.emptySet());
-            }});
+            return new AsyncShardFetch.FetchResult<>(tData, new HashMap<>() {
+                {
+                    put(shardId, Collections.emptySet());
+                }
+            });
         }
 
         @Override