From 4d1071ccc240c36f329fb7dfbe168c4de8d6e108 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 10 Oct 2025 14:54:04 +0200 Subject: [PATCH] cleanup GitOrigin-RevId: fe30fec0b870561084a76d0eb750ab4d38c1160c --- .../intellij/java/index/ConcurrentIndexTest.java | 13 ++++++------- .../cache/loader/JpsCompilationOutputLoader.java | 5 ++--- .../dependencies/DependencyResolvingBuilder.java | 3 ++- .../vfs/newvfs/impl/PersistentFS_FindFilesTest.java | 5 ++--- .../namecache/FileNameCacheMicroBenchmark.java | 5 ++--- .../intellij/util/lang/test/UrlClassLoaderTest.java | 5 ++--- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/java/index/ConcurrentIndexTest.java b/java/java-tests/testSrc/com/intellij/java/index/ConcurrentIndexTest.java index 99ee53127a82..ee6baef97746 100644 --- a/java/java-tests/testSrc/com/intellij/java/index/ConcurrentIndexTest.java +++ b/java/java-tests/testSrc/com/intellij/java/index/ConcurrentIndexTest.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.BombedProgressIndicator; import com.intellij.testFramework.SkipSlowTestLocally; import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.ref.GCWatcher; import org.jetbrains.annotations.NotNull; @@ -82,7 +83,7 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase { })); } - for (Future future : futuresToWait) future.get(); + ConcurrencyUtil.getAll(futuresToWait); } } @@ -149,7 +150,7 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase { } - for (Future future : futuresToWait) future.get(); + ConcurrencyUtil.getAll(futuresToWait); } } @@ -209,7 +210,7 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase { })); } - for (Future future : futuresToWait) future.get(); + ConcurrencyUtil.getAll(futuresToWait); } } @@ -253,12 +254,10 @@ public class ConcurrentIndexTest extends JavaCodeInsightFixtureTestCase { public void run(@NotNull ProgressIndicator indicator) { ReadAction.run(() -> { assertNotNull(JavaPsiFacade.getInstance(project).findClass("Foo", GlobalSearchScope.allScope(project))); - }); + }); } })); - for (Future future : futures) { - future.get(); - } + ConcurrencyUtil.getAll(futures); } } } diff --git a/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java b/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java index 0b1da07254ca..4f2b6eb07d2b 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java @@ -7,6 +7,7 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.NioFiles; import com.intellij.util.ArrayUtil; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.ZipUtil; import org.jetbrains.annotations.ApiStatus; @@ -91,9 +92,7 @@ public final class JpsCompilationOutputLoader implements JpsOutputLoader> futureList = ContainerUtil.map(outputLoadResults, loadResult -> EXECUTOR_SERVICE.submit(new UnzipOutputTask(result, loadResult, myContext))); - for (Future future : futureList) { - future.get(); - } + ConcurrencyUtil.getAll(futureList); myTmpFolderToModuleName = result; LOG.info("Unzip compilation output took: " + (System.currentTimeMillis() - start)); return LoaderStatus.COMPLETE; diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java index c8ff5cf8869c..17a5773131e9 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/dependencies/DependencyResolvingBuilder.java @@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.platform.jps.model.resolver.JpsDependencyResolverConfiguration; import com.intellij.platform.jps.model.resolver.JpsDependencyResolverConfigurationService; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.SmartList; import com.intellij.util.SystemProperties; import com.intellij.util.containers.CollectionFactory; @@ -226,7 +227,7 @@ public final class DependencyResolvingBuilder extends ModuleLevelBuilder { ExecutorService executorService = Executors.newFixedThreadPool(parallelism); try { List> futures = ContainerUtil.map(libs, lib -> executorService.submit(() -> resolveAction.accept(lib))); - for (Future future : futures) future.get(); + ConcurrencyUtil.getAll(futures); } finally { executorService.shutdown(); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/PersistentFS_FindFilesTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/PersistentFS_FindFilesTest.java index 25a3b16fe22f..f8512d44c42e 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/PersistentFS_FindFilesTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/impl/PersistentFS_FindFilesTest.java @@ -14,6 +14,7 @@ import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS; import com.intellij.openapi.vfs.newvfs.persistent.PersistentFSImpl; import com.intellij.testFramework.junit5.TestApplication; import com.intellij.testFramework.utils.vfs.CheckVFSHealthExtension; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeAll; @@ -312,9 +313,7 @@ public class PersistentFS_FindFilesTest { try { List> futures = ContainerUtil.map(tasks, task -> pool.submit(task)); - for (Future future : futures) { - future.get(); - } + ConcurrencyUtil.getAll(futures); } finally { pool.shutdown(); diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/namecache/FileNameCacheMicroBenchmark.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/namecache/FileNameCacheMicroBenchmark.java index 4b6f6e853875..e272080bc994 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/namecache/FileNameCacheMicroBenchmark.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/newvfs/persistent/namecache/FileNameCacheMicroBenchmark.java @@ -7,6 +7,7 @@ import com.intellij.openapi.vfs.newvfs.persistent.FSRecords; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.IdeaTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; +import com.intellij.util.ConcurrencyUtil; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.LongArrayList; @@ -191,9 +192,7 @@ public final class FileNameCacheMicroBenchmark { futures.add(ApplicationManager.getApplication().executeOnPooledThread( () -> testIteration.doTest(finalI, ids, threadRandom, queryCount))); } - for (Future future : futures) { - future.get(); - } + ConcurrencyUtil.getAll(futures); return System.currentTimeMillis() - start; } diff --git a/platform/util/testSrc/com/intellij/util/lang/test/UrlClassLoaderTest.java b/platform/util/testSrc/com/intellij/util/lang/test/UrlClassLoaderTest.java index f8151cbe8f2c..d42dc59679dc 100644 --- a/platform/util/testSrc/com/intellij/util/lang/test/UrlClassLoaderTest.java +++ b/platform/util/testSrc/com/intellij/util/lang/test/UrlClassLoaderTest.java @@ -5,6 +5,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.platform.ijent.community.buildConstants.IjentBuildScriptsConstantsKt; import com.intellij.testFramework.PlatformTestUtil; import com.intellij.testFramework.rules.TempDirectory; +import com.intellij.util.ConcurrencyUtil; import com.intellij.util.ExceptionUtil; import com.intellij.util.ThrowableConsumer; import com.intellij.util.lang.ClassPath; @@ -121,9 +122,7 @@ public class UrlClassLoaderTest { })); } - for (Future future : futures) { - future.get(); - } + ConcurrencyUtil.getAll(futures); } } finally {