From 246c0cef067b6aaafcdc515cd8e9b11364d28432 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Wed, 4 Jun 2025 12:20:39 +0200 Subject: [PATCH] API cleanup: mark for removal deprecated unused API (IJPL-178044) GitOrigin-RevId: b09c2c306607385ecea10d547c52477e0c55781f --- grid/core-impl/src/datagrid/NestedTablesAwareGridLoader.kt | 2 ++ .../src/org/jetbrains/jps/build/Standalone.java | 6 +++--- plugins/git4idea/src/git4idea/account/AccountUtil.kt | 2 ++ plugins/git4idea/src/git4idea/repo/GitRepoInfo.kt | 2 ++ plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.kt | 1 + .../plugins/github/api/GithubApiRequestExecutor.kt | 2 ++ .../src/service/resolve/GradleVersionCatalogHandler.kt | 3 ++- .../src/main/kotlin/com/intellij/grazie/text/RuleGroup.kt | 3 +++ .../jetbrains/idea/maven/server/MavenServerConnector.kt | 1 + .../python/newProject/steps/PyAddNewEnvironmentPanel.kt | 3 ++- .../python/sdk/add/v2/PythonAddNewEnvironmentPanel.kt | 7 ++++++- python/src/com/jetbrains/python/testing/PyTest.kt | 4 +++- .../src/com/intellij/javaee/ResourceRegistrarImpl.kt | 3 +-- 13 files changed, 30 insertions(+), 9 deletions(-) diff --git a/grid/core-impl/src/datagrid/NestedTablesAwareGridLoader.kt b/grid/core-impl/src/datagrid/NestedTablesAwareGridLoader.kt index b1619bc69588..80bcb480b6a6 100644 --- a/grid/core-impl/src/datagrid/NestedTablesAwareGridLoader.kt +++ b/grid/core-impl/src/datagrid/NestedTablesAwareGridLoader.kt @@ -2,7 +2,9 @@ package com.intellij.database.datagrid import com.intellij.database.datagrid.NestedTablesDataGridModel.NestedTableCellCoordinate import com.intellij.database.datagrid.nested.NestedTablesAware +import org.jetbrains.annotations.ApiStatus +@ApiStatus.ScheduledForRemoval @Deprecated(replaceWith = ReplaceWith("NestedTablesGridLoader"), message = "Use NestedTablesGridLoader instead") interface NestedTablesAwareGridLoader { @Suppress("unused") diff --git a/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java b/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java index d48bd3532786..19af12c07035 100644 --- a/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java +++ b/jps/standalone-builder/src/org/jetbrains/jps/build/Standalone.java @@ -180,7 +180,7 @@ public final class Standalone { /** * @deprecated Use {@link #runBuild(JpsModelLoader, Path, Map, MessageHandler, List, boolean, CanceledStatus)} */ - @Deprecated + @Deprecated(forRemoval = true) public static void runBuild(@NotNull JpsModelLoader loader, @NotNull File dataStorageRoot, @NotNull MessageHandler messageHandler, @@ -198,7 +198,7 @@ public final class Standalone { /** * @deprecated Use {@link #runBuild(JpsModelLoader, Path, Map, MessageHandler, List, boolean, CanceledStatus)} */ - @Deprecated + @Deprecated(forRemoval = true) public static void runBuild(@NotNull JpsModelLoader loader, @NotNull File dataStorageRoot, @NotNull Map buildParameters, @NotNull MessageHandler messageHandler, @NotNull List scopes, @@ -209,7 +209,7 @@ public final class Standalone { /** * @deprecated Use {@link #runBuild(JpsModelLoader, Path, Map, MessageHandler, List, boolean, CanceledStatus)} */ - @Deprecated + @Deprecated(forRemoval = true) public static void runBuild(@NotNull JpsModelLoader loader, @NotNull File dataStorageRoot, @NotNull Map buildParameters, diff --git a/plugins/git4idea/src/git4idea/account/AccountUtil.kt b/plugins/git4idea/src/git4idea/account/AccountUtil.kt index 359c7ca39afe..d45a423c4e9f 100644 --- a/plugins/git4idea/src/git4idea/account/AccountUtil.kt +++ b/plugins/git4idea/src/git4idea/account/AccountUtil.kt @@ -10,7 +10,9 @@ import git4idea.remote.hosting.HostedGitRepositoriesManager import git4idea.remote.hosting.HostedGitRepositoryMapping import git4idea.repo.GitRepository import git4idea.ui.branch.GitRepositoryMappingData +import org.jetbrains.annotations.ApiStatus +@ApiStatus.ScheduledForRemoval @Deprecated("Use git4idea.push.GitPushNotificationUtil instead") object AccountUtil { diff --git a/plugins/git4idea/src/git4idea/repo/GitRepoInfo.kt b/plugins/git4idea/src/git4idea/repo/GitRepoInfo.kt index d0a1d081c2da..7affbee55f33 100644 --- a/plugins/git4idea/src/git4idea/repo/GitRepoInfo.kt +++ b/plugins/git4idea/src/git4idea/repo/GitRepoInfo.kt @@ -7,6 +7,7 @@ import com.intellij.vcs.log.Hash import git4idea.GitLocalBranch import git4idea.GitReference import git4idea.GitRemoteBranch +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.NonNls data class GitRepoInfo(val currentBranch: GitLocalBranch?, @@ -23,6 +24,7 @@ data class GitRepoInfo(val currentBranch: GitLocalBranch?, branchTrackInfos.associateByTo(CollectionFactory.createCustomHashingStrategyMap(GitReference.BRANCH_NAME_HASHING_STRATEGY)) { it.localBranch.name } val remoteBranches: Collection + @ApiStatus.ScheduledForRemoval @Deprecated("") get() = remoteBranchesWithHashes.keys diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.kt b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.kt index 806baf2ec7e3..20395e9ff8b8 100644 --- a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.kt +++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.kt @@ -223,6 +223,7 @@ class GitRepositoryImpl private constructor( private val LOG = Logger.getInstance(GitRepositoryImpl::class.java) @JvmStatic + @ApiStatus.ScheduledForRemoval @Deprecated("Use {@link GitRepositoryManager#getRepositoryForRoot} to obtain an instance of a Git repository.") fun getInstance( root: VirtualFile, diff --git a/plugins/github/github-core/src/org/jetbrains/plugins/github/api/GithubApiRequestExecutor.kt b/plugins/github/github-core/src/org/jetbrains/plugins/github/api/GithubApiRequestExecutor.kt index eaaf44ac3e43..8e31184687c3 100644 --- a/plugins/github/github-core/src/org/jetbrains/plugins/github/api/GithubApiRequestExecutor.kt +++ b/plugins/github/github-core/src/org/jetbrains/plugins/github/api/GithubApiRequestExecutor.kt @@ -18,6 +18,7 @@ import com.intellij.util.io.HttpSecurityUtil import com.intellij.util.io.RequestBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext +import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.TestOnly import org.jetbrains.plugins.github.api.data.GithubErrorMessage import org.jetbrains.plugins.github.exceptions.* @@ -239,6 +240,7 @@ sealed class GithubApiRequestExecutor { @Service class Factory { + @ApiStatus.ScheduledForRemoval @Deprecated("Server must be provided to match URL for authorization") fun create(token: String): GithubApiRequestExecutor = create(true) { token } diff --git a/plugins/gradle/java/src/service/resolve/GradleVersionCatalogHandler.kt b/plugins/gradle/java/src/service/resolve/GradleVersionCatalogHandler.kt index 1b042a27aca8..ae13e640668a 100644 --- a/plugins/gradle/java/src/service/resolve/GradleVersionCatalogHandler.kt +++ b/plugins/gradle/java/src/service/resolve/GradleVersionCatalogHandler.kt @@ -2,8 +2,8 @@ package org.jetbrains.plugins.gradle.service.resolve import com.intellij.openapi.extensions.ExtensionPointName -import com.intellij.openapi.project.Project import com.intellij.openapi.module.Module +import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement @@ -47,6 +47,7 @@ fun getVersionCatalogFiles(module: Module) : Map { return container } +@ApiStatus.ScheduledForRemoval @Deprecated("Doesn't work for included builds of a composite build", ReplaceWith("getVersionCatalogFiles(module)")) fun getGradleStaticallyHandledExtensions(project: Project) : Set { val container = mutableSetOf() diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/RuleGroup.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/RuleGroup.kt index 357f1aead501..82bd5c2457d9 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/RuleGroup.kt +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/text/RuleGroup.kt @@ -1,5 +1,7 @@ package com.intellij.grazie.text +import com.intellij.grazie.text.RuleGroup.Companion.SENTENCE_END_PUNCTUATION +import com.intellij.grazie.text.RuleGroup.Companion.UNLIKELY_OPENING_PUNCTUATION import org.jetbrains.annotations.ApiStatus import java.util.* @@ -45,6 +47,7 @@ open class RuleGroup(rules: Set) { /** Rules for checking punctuation errors */ @JvmField + @ApiStatus.ScheduledForRemoval @Deprecated("use SENTENCE_BOUNDARY", ReplaceWith("SENTENCE_BOUNDARY_PUNCTUATION")) val PUNCTUATION = SENTENCE_BOUNDARY_PUNCTUATION diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnector.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnector.kt index 8aa06f98362b..d2736ea9e64c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnector.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenServerConnector.kt @@ -31,6 +31,7 @@ interface MavenServerConnector : Disposable { @ApiStatus.Internal fun connect() + @ApiStatus.ScheduledForRemoval @ApiStatus.Internal @Deprecated("use suspend", ReplaceWith("ping")) fun pingBlocking(): Boolean diff --git a/python/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt b/python/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt index 2c32abee24f2..d15ff3af8c45 100644 --- a/python/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt +++ b/python/src/com/jetbrains/python/newProject/steps/PyAddNewEnvironmentPanel.kt @@ -17,12 +17,13 @@ import com.jetbrains.python.sdk.add.v1.PyAddNewVirtualEnvPanel import com.jetbrains.python.sdk.add.PyAddSdkPanel import com.jetbrains.python.sdk.add.v2.PythonInterpreterSelectionMode import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer +import org.jetbrains.annotations.ApiStatus import java.awt.BorderLayout import java.awt.event.ItemEvent import javax.swing.JComboBox internal class PyAddNewEnvironmentPanel internal constructor(existingSdks: List, newProjectPath: String?, preferredInterpreterType: PythonInterpreterSelectionMode? = null) : PyAddSdkPanel() { - + @ApiStatus.ScheduledForRemoval @Deprecated(message = "Use constructor without ignored") constructor(existingSdks: List, newProjectPath: String?, @Suppress("UNUSED_PARAMETER") ignored: String?) : this(existingSdks, newProjectPath, preferredInterpreterType = null) diff --git a/python/src/com/jetbrains/python/sdk/add/v2/PythonAddNewEnvironmentPanel.kt b/python/src/com/jetbrains/python/sdk/add/v2/PythonAddNewEnvironmentPanel.kt index 3e3e254898a0..13c69cf7c6a2 100644 --- a/python/src/com/jetbrains/python/sdk/add/v2/PythonAddNewEnvironmentPanel.kt +++ b/python/src/com/jetbrains/python/sdk/add/v2/PythonAddNewEnvironmentPanel.kt @@ -16,7 +16,10 @@ import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.ui.validation.WHEN_PROPERTY_CHANGED import com.intellij.platform.ide.progress.ModalTaskOwner import com.intellij.platform.ide.progress.runWithModalProgressBlocking -import com.intellij.ui.dsl.builder.* +import com.intellij.ui.dsl.builder.AlignX +import com.intellij.ui.dsl.builder.Panel +import com.intellij.ui.dsl.builder.TopGap +import com.intellij.ui.dsl.builder.bindText import com.intellij.util.concurrency.annotations.RequiresEdt import com.intellij.util.ui.showingScope import com.jetbrains.python.PyBundle.message @@ -40,6 +43,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext +import org.jetbrains.annotations.ApiStatus /** * If `onlyAllowedInterpreterTypes` then only these types are displayed. All types displayed otherwise @@ -156,6 +160,7 @@ internal class PythonAddNewEnvironmentPanel( } } + @ApiStatus.ScheduledForRemoval @Deprecated("Use one with module or project") fun getSdk(): Sdk { val moduleOrProject = ModuleOrProject.ProjectOnly(ProjectManager.getInstance().defaultProject) diff --git a/python/src/com/jetbrains/python/testing/PyTest.kt b/python/src/com/jetbrains/python/testing/PyTest.kt index 0ef2e7d5a1a0..d1135e5fdd55 100644 --- a/python/src/com/jetbrains/python/testing/PyTest.kt +++ b/python/src/com/jetbrains/python/testing/PyTest.kt @@ -15,6 +15,7 @@ import com.intellij.openapi.options.advanced.AdvancedSettings import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.util.Pair +import com.intellij.openapi.util.registry.Registry import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.execution.ParametersListUtil import com.jetbrains.python.PyBundle @@ -22,7 +23,7 @@ import com.jetbrains.python.PythonHelper import com.jetbrains.python.run.target.HelpersAwareTargetEnvironmentRequest import com.jetbrains.python.run.targetBasedConfiguration.PyRunTargetVariant import com.jetbrains.python.testing.PyTestSharedForm.create -import com.intellij.openapi.util.registry.Registry +import org.jetbrains.annotations.ApiStatus /** * Pytest runner @@ -131,6 +132,7 @@ class PyTestConfiguration(project: Project, factory: PyTestFactory) } class PyTestFactory(type: PythonTestConfigurationType) : PyAbstractTestFactory(type) { + @ApiStatus.ScheduledForRemoval @Deprecated("Obtain instance from PythonTestConfigurationType") constructor() : this(PythonTestConfigurationType.getInstance()) diff --git a/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt b/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt index ac1fa414f9e8..3cc34d26c9e0 100644 --- a/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt +++ b/xml/xml-psi-impl/src/com/intellij/javaee/ResourceRegistrarImpl.kt @@ -3,8 +3,6 @@ package com.intellij.javaee import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.NonNls -import java.util.ArrayList -import java.util.HashMap class ResourceRegistrarImpl : ResourceRegistrar { private val resources = HashMap>() @@ -40,6 +38,7 @@ class ResourceRegistrarImpl : ResourceRegistrar { ignored.add(url) } + @ApiStatus.ScheduledForRemoval @Deprecated("Pass class loader explicitly", level = DeprecationLevel.ERROR) fun addInternalResource(resource: @NonNls String, fileName: @NonNls String?) { addStdResource(