From 093d3214f404995a742cd303c1cc019e4bc84f0d Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Sat, 4 Oct 2025 00:30:05 +0300 Subject: [PATCH] [java] API cleanup: mark for removal and as internal deprecated API without external usages (IJPL-190638) APIs, which were marked as deprecated in 251 or earlier and don't have external usages, are marked as internal. Also, if there are no internal usages, it's also marked for removal. GitOrigin-RevId: ffd772fc41738cdf3bcf5a122756936383184866 --- .../compiler/backwardRefs/CompilerReferenceReader.java | 4 +++- .../debugger/ui/breakpoints/BreakpointManager.java | 2 ++ .../intellij/ide/projectWizard/generators/AssetsJava.kt | 9 ++++++++- .../ide/projectWizard/generators/AssetsOnboardingTips.kt | 4 ++++ .../generators/AssetsOnboardingTipsProjectWizardStep.kt | 3 +++ .../src/com/siyeh/ig/BaseInspection.java | 6 ++---- .../src/com/intellij/BaseJavaJspElementType.java | 4 ++-- .../source/AbstractBasicJavaDocElementTypeFactory.java | 2 +- .../impl/source/AbstractBasicJavaElementTypeFactory.java | 2 +- .../jarRepository/services/bintray/BintrayEndpoint.java | 2 ++ .../jarRepository/services/bintray/BintrayModel.java | 2 ++ .../services/bintray/BintrayRepositoryService.java | 2 ++ .../src/com/intellij/codeInsight/AnnotationUtil.java | 1 + .../src/com/intellij/psi/ClassFileViewProvider.java | 2 +- 14 files changed, 34 insertions(+), 11 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java index 98d9122d0b0b..25245a8eddd4 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceReader.java @@ -5,6 +5,7 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.indexing.StorageException; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.backwardRefs.CompilerRef; @@ -29,7 +30,8 @@ public abstract class CompilerReferenceReader Int?): Unit = AssetsOnboardingTips.prepareOnboardingTips(project, fileName, breakpointSelector) \ No newline at end of file diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/AssetsOnboardingTipsProjectWizardStep.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/AssetsOnboardingTipsProjectWizardStep.kt index 683ae8f5274d..d32bdce5e79c 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/AssetsOnboardingTipsProjectWizardStep.kt +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/AssetsOnboardingTipsProjectWizardStep.kt @@ -3,8 +3,11 @@ package com.intellij.ide.projectWizard.generators import com.intellij.ide.wizard.NewProjectWizardStep import com.intellij.openapi.project.Project +import org.jetbrains.annotations.ApiStatus import com.intellij.ide.projectWizard.generators.prepareOnboardingTips as prepareOnboardingTipsImpl +@ApiStatus.Internal +@ApiStatus.ScheduledForRemoval @Deprecated("Use AssetsOnboardingTips util instead") abstract class AssetsOnboardingTipsProjectWizardStep(parent: NewProjectWizardStep) : AssetsNewProjectWizardStep(parent) { protected fun rawShortcut(shortcut: String) = AssetsOnboardingTips.rawShortcut(shortcut) diff --git a/java/java-analysis-impl/src/com/siyeh/ig/BaseInspection.java b/java/java-analysis-impl/src/com/siyeh/ig/BaseInspection.java index e152ad547d07..8c4d18a9a4ae 100644 --- a/java/java-analysis-impl/src/com/siyeh/ig/BaseInspection.java +++ b/java/java-analysis-impl/src/com/siyeh/ig/BaseInspection.java @@ -28,10 +28,7 @@ import com.intellij.psi.PsiFile; import com.intellij.util.ArrayUtil; import com.intellij.util.ReflectionUtil; import org.jdom.Element; -import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.*; import java.util.List; @@ -156,6 +153,7 @@ public abstract class BaseInspection extends AbstractBaseJavaLocalInspectionTool * * @deprecated use {@link #isAvailableForFile(PsiFile)} or {@link #requiredFeatures()} */ + @ApiStatus.Internal @Deprecated public boolean shouldInspect(@NotNull PsiFile file) { return true; diff --git a/java/java-frontback-impl/src/com/intellij/BaseJavaJspElementType.java b/java/java-frontback-impl/src/com/intellij/BaseJavaJspElementType.java index 6c81302d8527..63905dea82a1 100644 --- a/java/java-frontback-impl/src/com/intellij/BaseJavaJspElementType.java +++ b/java/java-frontback-impl/src/com/intellij/BaseJavaJspElementType.java @@ -9,8 +9,8 @@ import org.jetbrains.annotations.ApiStatus; /** * @deprecated Use the direct comparison. */ -@Deprecated -@ApiStatus.ScheduledForRemoval +@ApiStatus.Internal +@Deprecated(forRemoval = true) public interface BaseJavaJspElementType { ParentAwareTokenSet WHITE_SPACE_BIT_SET = ParentAwareTokenSet.orSet( ParentAwareTokenSet.create(TokenSet.WHITE_SPACE), diff --git a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaDocElementTypeFactory.java b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaDocElementTypeFactory.java index 6f95a180e4c3..146e3b35c8e3 100644 --- a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaDocElementTypeFactory.java +++ b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaDocElementTypeFactory.java @@ -14,7 +14,7 @@ import org.jetbrains.annotations.ApiStatus; */ @Deprecated @ApiStatus.ScheduledForRemoval -@ApiStatus.Experimental +@ApiStatus.Internal public abstract class AbstractBasicJavaDocElementTypeFactory { public static final class JavaDocElementTypeContainer { public final IElementType DOC_TAG; diff --git a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaElementTypeFactory.java b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaElementTypeFactory.java index 3d5f3208083b..0b3c1d4b862e 100644 --- a/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaElementTypeFactory.java +++ b/java/java-frontback-psi-impl/src/com/intellij/psi/impl/source/AbstractBasicJavaElementTypeFactory.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.ApiStatus; */ @Deprecated @ApiStatus.ScheduledForRemoval -@ApiStatus.Experimental +@ApiStatus.Internal public abstract class AbstractBasicJavaElementTypeFactory { public static class JavaElementTypeContainer { diff --git a/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayEndpoint.java b/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayEndpoint.java index de18df430302..d6c2b7f3c4f9 100644 --- a/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayEndpoint.java +++ b/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayEndpoint.java @@ -7,6 +7,7 @@ import com.intellij.jarRepository.RemoteRepositoryDescription; import com.intellij.jarRepository.RepositoryArtifactDescription; import com.intellij.util.ThrowableConsumer; import com.intellij.util.io.HttpRequests; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,6 +36,7 @@ import static java.util.Collections.emptyList; /** * @deprecated since Bintray service is scheduled for sunsetting in May 2021 */ +@ApiStatus.Internal @Deprecated(forRemoval = true) public class BintrayEndpoint { diff --git a/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayModel.java b/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayModel.java index 6bf492f1c048..d879d6e2824d 100644 --- a/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayModel.java +++ b/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayModel.java @@ -1,6 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.jarRepository.services.bintray; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -9,6 +10,7 @@ import java.util.List; /** * @deprecated since Bintray service is scheduled for sunsetting in May 2021 */ +@ApiStatus.Internal @Deprecated(forRemoval = true) public class BintrayModel { diff --git a/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayRepositoryService.java b/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayRepositoryService.java index 819002a01bce..f37e441f6d9a 100644 --- a/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayRepositoryService.java +++ b/java/java-impl/src/com/intellij/jarRepository/services/bintray/BintrayRepositoryService.java @@ -5,6 +5,7 @@ import com.intellij.jarRepository.RemoteRepositoryDescription; import com.intellij.jarRepository.RepositoryArtifactDescription; import com.intellij.jarRepository.services.MavenRepositoryService; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Unmodifiable; @@ -20,6 +21,7 @@ import static java.util.Collections.emptyList; /** * @deprecated since Bintray service is scheduled for sunsetting in May 2021 */ +@ApiStatus.Internal @SuppressWarnings("DeprecatedIsStillUsed") // allow to use it in 2021.1 @Deprecated(forRemoval = true) public class BintrayRepositoryService extends MavenRepositoryService { diff --git a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java index cb528ae3ffe9..0aa3b0ec1cd7 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java @@ -702,6 +702,7 @@ public class AnnotationUtil { {"NotNull", "Nullable", "NonNls", "PropertyKey", "TestOnly", "Language", "Identifier", "Pattern", "PrintFormat", "RegExp", "Subst"}; /** @deprecated simple name is not enough for reliable identification */ + @ApiStatus.Internal @ApiStatus.ScheduledForRemoval @Deprecated public static boolean isJetbrainsAnnotation(@NotNull String simpleName) { diff --git a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java index 4c96aa92e190..156295c4cb1e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java +++ b/java/java-psi-impl/src/com/intellij/psi/ClassFileViewProvider.java @@ -9,7 +9,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.impl.PsiManagerImpl; import com.intellij.psi.impl.compiled.ClsFileImpl; import com.intellij.psi.impl.file.PsiBinaryFileImpl; import org.jetbrains.annotations.ApiStatus; @@ -61,6 +60,7 @@ public class ClassFileViewProvider extends SingleRootFileViewProvider { /** * @deprecated use {@link #isInnerClass(VirtualFile)} or {@link #isInnerClass(VirtualFile, ClassReader)} */ + @ApiStatus.Internal @ApiStatus.ScheduledForRemoval @Deprecated public static boolean isInnerClass(@NotNull VirtualFile file, byte @NotNull [] content) {