Change

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -33,7 +33,6 @@
 import org.elasticsearch.cluster.ClusterStateObserver;
 import org.elasticsearch.cluster.action.index.MappingUpdatedAction;
 import org.elasticsearch.cluster.action.shard.ShardStateAction;
-import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.project.ProjectResolver;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.bytes.BytesReference;
@@ -74,8 +73,6 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.LockSupport;
 import java.util.function.Consumer;
 import java.util.function.LongSupplier;
 import java.util.function.ObjLongConsumer;
@@ -169,12 +166,7 @@ protected void shardOperationOnPrimary(
 
     @Override
     protected Map<ShardId, BulkShardRequest> splitRequestOnPrimary(BulkShardRequest request) {
-        // TODO Needed right now for not in primary mode on the target. Need to make sure we handle that with retries.
-//        LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(100));
-        ClusterState clusterState = clusterService.state();
-        ProjectMetadata project = projectResolver.getProjectMetadata(clusterState);
-
-        return ShardBulkSplitHelper.splitRequests(request, project);
+        return ShardBulkSplitHelper.splitRequests(request, projectResolver.getProjectMetadata(clusterService.state()));
     }
 
     @Override

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authc/AuthenticationTests.java

@@ -51,7 +51,6 @@
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
 import static org.hamcrest.Matchers.sameInstance;