SNAPSHOT - Revert copilot suggestions

Author: lukewhiting

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java

@@ -90,7 +90,7 @@ public final class RerouteProcessor extends AbstractProcessor {
     public IngestDocument execute(IngestDocument ingestDocument) throws Exception {
         if (destination != null) {
             ProjectMetadata projectMetadata = clusterService.state().projectState(projectId).metadata();
-            streamsPermissionsUtils.throwIfRetrouteToSubstreamNotAllowed(projectMetadata, ingestDocument.getIndexHistory(), destination);
+            streamsPermissionsUtils.throwIfRerouteToSubstreamNotAllowed(projectMetadata, ingestDocument.getIndexHistory(), destination);
             ingestDocument.reroute(destination);
             return ingestDocument;
         }

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/RerouteProcessorTests.java

@@ -45,7 +45,7 @@ public void setUpStreamsPermissionsUtils() {
             .putProjectMetadata(ProjectMetadata.builder(ProjectId.DEFAULT).build())
             .build();
         when(clusterServiceMock.state()).thenReturn(clusterState);
-        doNothing().when(streamsPermissionsUtilsMock).throwIfRetrouteToSubstreamNotAllowed(any(), any(), anyString());
+        doNothing().when(streamsPermissionsUtilsMock).throwIfRerouteToSubstreamNotAllowed(any(), any(), anyString());
     }
 
     public void testDefaults() throws Exception {

server/src/test/java/org/elasticsearch/action/bulk/BulkOperationTests.java

@@ -251,7 +251,7 @@ public class BulkOperationTests extends ESTestCase {
     private TestThreadPool threadPool;
 
     private StreamsPermissionsUtils streamsPermissionsUtilsMock;
-    // Removed the unused projectResolverMock field.
+    private ProjectResolver projectResolverMock;
     private IndexNameExpressionResolver indexNameExpressionResolverMock;
 
     @Before

server/src/test/java/org/elasticsearch/common/streams/StreamsPermissionsUtilsTests.java

@@ -66,41 +66,41 @@ public void testIfRetrouteToSubstreamNotAllowedThrows() {
 
         IllegalArgumentException ex = expectThrows(
             IllegalArgumentException.class,
-            () -> utils.throwIfRetrouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination)
+            () -> utils.throwIfRerouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination)
         );
 
         assertTrue(ex.getMessage().contains("Cannot reroute to substream"));
         assertTrue(ex.getMessage().contains(destination));
     }
 
-    public void testThrowIfRetrouteToSubstreamNotAllowedDoesNotThrowWhenStreamTypeDisabled() {
+    public void testthrowIfRerouteToSubstreamNotAllowedDoesNotThrowWhenStreamTypeDisabled() {
         when(streamsMetadataMock.isLogsEnabled()).thenReturn(false);
 
         Set<String> indexHistory = Collections.emptySet();
         String destination = StreamType.LOGS.getStreamName() + ".substream";
 
         // Should not throw since stream type is disabled
-        utils.throwIfRetrouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination);
+        utils.throwIfRerouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination);
     }
 
-    public void testThrowIfRetrouteToSubstreamNotAllowedDoesNotThrowWhenDestinationNotSubstream() {
+    public void testthrowIfRerouteToSubstreamNotAllowedDoesNotThrowWhenDestinationNotSubstream() {
         when(streamsMetadataMock.isLogsEnabled()).thenReturn(true);
 
         Set<String> indexHistory = Collections.emptySet();
         String destination = StreamType.LOGS.getStreamName(); // not a substream
 
         // Should not throw since destination is not a substream
-        utils.throwIfRetrouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination);
+        utils.throwIfRerouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination);
     }
 
-    public void testThrowIfRetrouteToSubstreamNotAllowedDoesNotThrowWhenIndexHistoryContainsStream() {
+    public void testthrowIfRerouteToSubstreamNotAllowedDoesNotThrowWhenIndexHistoryContainsStream() {
         when(streamsMetadataMock.isLogsEnabled()).thenReturn(true);
 
         Set<String> indexHistory = new HashSet<>();
         indexHistory.add(StreamType.LOGS.getStreamName());
         String destination = StreamType.LOGS.getStreamName() + ".substream";
 
         // Should not throw since indexHistory contains the stream name
-        utils.throwIfRetrouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination);
+        utils.throwIfRerouteToSubstreamNotAllowed(projectMetadataMock, indexHistory, destination);
     }
 }