[CI] Auto commit changes from spotless

elasticsearchmachine · elasticsearchmachine · commit c7043b3ad286 · 2025-06-18T07:02:18.000Z
diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java
@@ -392,8 +392,8 @@ void runWithPrimaryShardReference(final TransportReplicationAction.PrimaryShardR
             }
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java b/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceDiskSpaceTests.java
@@ -524,8 +524,8 @@ public void testAvailableDiskSpaceMonitorSettingsUpdate() throws Exception {
         }
         if (setThreadPoolMergeSchedulerSetting) {
             assertWarnings(
-                    "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                            + "See the breaking changes documentation for the next major version."
+                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                    + "See the breaking changes documentation for the next major version."
             );
         }
     }
@@ -603,8 +603,8 @@ public void testAbortingOrRunningMergeTaskHoldsUpBudget() throws Exception {
         }
         if (setThreadPoolMergeSchedulerSetting) {
             assertWarnings(
-                    "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                            + "See the breaking changes documentation for the next major version."
+                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                    + "See the breaking changes documentation for the next major version."
             );
         }
     }
@@ -747,8 +747,8 @@ && randomBoolean()) {
         }
         if (setThreadPoolMergeSchedulerSetting) {
             assertWarnings(
-                    "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                            + "See the breaking changes documentation for the next major version."
+                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                    + "See the breaking changes documentation for the next major version."
             );
         }
     }
@@ -890,8 +890,8 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro
         }
         if (setThreadPoolMergeSchedulerSetting) {
             assertWarnings(
-                    "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                            + "See the breaking changes documentation for the next major version."
+                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                    + "See the breaking changes documentation for the next major version."
             );
         }
     }
@@ -1047,8 +1047,8 @@ public void testMergeTasksAreUnblockedWhenMoreDiskSpaceBecomesAvailable() throws
         }
         if (setThreadPoolMergeSchedulerSetting) {
             assertWarnings(
-                    "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                            + "See the breaking changes documentation for the next major version."
+                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                    + "See the breaking changes documentation for the next major version."
             );
         }
     }
diff --git a/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceTests.java b/server/src/test/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorServiceTests.java
@@ -303,8 +303,8 @@ public void testTargetIORateChangesWhenSubmittingMergeTasks() throws Exception {
             assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
@@ -395,8 +395,8 @@ public void testIORateIsAdjustedForAllRunningMergeTasks() throws Exception {
             assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
@@ -580,8 +580,8 @@ public void testMergeTasksRunConcurrently() throws Exception {
             assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
@@ -643,8 +643,8 @@ public void testThreadPoolStatsWithBackloggedMergeTasks() throws Exception {
             });
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
@@ -718,8 +718,8 @@ public void testBackloggedMergeTasksExecuteExactlyOnce() throws Exception {
             });
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java b/server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java
@@ -667,8 +667,8 @@ public void testLateDeliveryAfterGCTriggeredOnReplica() throws Exception {
             shards.assertAllEqual(0);
         }
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/elasticsearch/index/shard/RefreshListenersTests.java
@@ -187,8 +187,8 @@ public void onFailedEngine(String reason, @Nullable Exception e) {
     @After
     public void tearDownListeners() throws Exception {
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
         IOUtils.close(engine, store, nodeEnvironment, () -> terminate(threadPool));
     }
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/repository/CcrRestoreSourceServiceTests.java
@@ -53,8 +53,8 @@ public void setUp() throws Exception {
     @After
     public void assertWarnings() {
         assertWarnings(
-                "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
-                        + "See the breaking changes documentation for the next major version."
+            "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "
+                + "See the breaking changes documentation for the next major version."
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -392,8 +392,8 @@ void runWithPrimaryShardReference(final TransportReplicationAction.PrimaryShardR`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`	`assertWarnings(`
`395`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`396`		`- + "See the breaking changes documentation for the next major version."`
	`395`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`396`	`+ + "See the breaking changes documentation for the next major version."`
`397`	`397`	`);`
`398`	`398`	`}`
`399`	`399`
Original file line number	Diff line number	Diff line change
`@@ -524,8 +524,8 @@ public void testAvailableDiskSpaceMonitorSettingsUpdate() throws Exception {`
`524`	`524`	`}`
`525`	`525`	`if (setThreadPoolMergeSchedulerSetting) {`
`526`	`526`	`assertWarnings(`
`527`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`528`		`- + "See the breaking changes documentation for the next major version."`
	`527`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`528`	`+ + "See the breaking changes documentation for the next major version."`
`529`	`529`	`);`
`530`	`530`	`}`
`531`	`531`	`}`
`@@ -603,8 +603,8 @@ public void testAbortingOrRunningMergeTaskHoldsUpBudget() throws Exception {`
`603`	`603`	`}`
`604`	`604`	`if (setThreadPoolMergeSchedulerSetting) {`
`605`	`605`	`assertWarnings(`
`606`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`607`		`- + "See the breaking changes documentation for the next major version."`
	`606`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`607`	`+ + "See the breaking changes documentation for the next major version."`
`608`	`608`	`);`
`609`	`609`	`}`
`610`	`610`	`}`
`@@ -747,8 +747,8 @@ && randomBoolean()) {`
`747`	`747`	`}`
`748`	`748`	`if (setThreadPoolMergeSchedulerSetting) {`
`749`	`749`	`assertWarnings(`
`750`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`751`		`- + "See the breaking changes documentation for the next major version."`
	`750`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`751`	`+ + "See the breaking changes documentation for the next major version."`
`752`	`752`	`);`
`753`	`753`	`}`
`754`	`754`	`}`
`@@ -890,8 +890,8 @@ public void testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution() thro`
`890`	`890`	`}`
`891`	`891`	`if (setThreadPoolMergeSchedulerSetting) {`
`892`	`892`	`assertWarnings(`
`893`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`894`		`- + "See the breaking changes documentation for the next major version."`
	`893`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`894`	`+ + "See the breaking changes documentation for the next major version."`
`895`	`895`	`);`
`896`	`896`	`}`
`897`	`897`	`}`
`@@ -1047,8 +1047,8 @@ public void testMergeTasksAreUnblockedWhenMoreDiskSpaceBecomesAvailable() throws`
`1047`	`1047`	`}`
`1048`	`1048`	`if (setThreadPoolMergeSchedulerSetting) {`
`1049`	`1049`	`assertWarnings(`
`1050`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`1051`		`- + "See the breaking changes documentation for the next major version."`
	`1050`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`1051`	`+ + "See the breaking changes documentation for the next major version."`
`1052`	`1052`	`);`
`1053`	`1053`	`}`
`1054`	`1054`	`}`
Original file line number	Diff line number	Diff line change
`@@ -303,8 +303,8 @@ public void testTargetIORateChangesWhenSubmittingMergeTasks() throws Exception {`
`303`	`303`	`assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));`
`304`	`304`	`}`
`305`	`305`	`assertWarnings(`
`306`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`307`		`- + "See the breaking changes documentation for the next major version."`
	`306`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`307`	`+ + "See the breaking changes documentation for the next major version."`
`308`	`308`	`);`
`309`	`309`	`}`
`310`	`310`
`@@ -395,8 +395,8 @@ public void testIORateIsAdjustedForAllRunningMergeTasks() throws Exception {`
`395`	`395`	`assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));`
`396`	`396`	`}`
`397`	`397`	`assertWarnings(`
`398`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`399`		`- + "See the breaking changes documentation for the next major version."`
	`398`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`399`	`+ + "See the breaking changes documentation for the next major version."`
`400`	`400`	`);`
`401`	`401`	`}`
`402`	`402`
`@@ -580,8 +580,8 @@ public void testMergeTasksRunConcurrently() throws Exception {`
`580`	`580`	`assertBusy(() -> assertTrue(threadPoolMergeExecutorService.allDone()));`
`581`	`581`	`}`
`582`	`582`	`assertWarnings(`
`583`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`584`		`- + "See the breaking changes documentation for the next major version."`
	`583`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`584`	`+ + "See the breaking changes documentation for the next major version."`
`585`	`585`	`);`
`586`	`586`	`}`
`587`	`587`
`@@ -643,8 +643,8 @@ public void testThreadPoolStatsWithBackloggedMergeTasks() throws Exception {`
`643`	`643`	`});`
`644`	`644`	`}`
`645`	`645`	`assertWarnings(`
`646`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`647`		`- + "See the breaking changes documentation for the next major version."`
	`646`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`647`	`+ + "See the breaking changes documentation for the next major version."`
`648`	`648`	`);`
`649`	`649`	`}`
`650`	`650`
`@@ -718,8 +718,8 @@ public void testBackloggedMergeTasksExecuteExactlyOnce() throws Exception {`
`718`	`718`	`});`
`719`	`719`	`}`
`720`	`720`	`assertWarnings(`
`721`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`722`		`- + "See the breaking changes documentation for the next major version."`
	`721`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`722`	`+ + "See the breaking changes documentation for the next major version."`
`723`	`723`	`);`
`724`	`724`	`}`
`725`	`725`
Original file line number	Diff line number	Diff line change
`@@ -667,8 +667,8 @@ public void testLateDeliveryAfterGCTriggeredOnReplica() throws Exception {`
`667`	`667`	`shards.assertAllEqual(0);`
`668`	`668`	`}`
`669`	`669`	`assertWarnings(`
`670`		`- "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
`671`		`- + "See the breaking changes documentation for the next major version."`
	`670`	`+ "[indices.merge.scheduler.use_thread_pool] setting was deprecated in Elasticsearch and will be removed in a future release. "`
	`671`	`+ + "See the breaking changes documentation for the next major version."`
`672`	`672`	`);`
`673`	`673`	`}`
`674`	`674`