From 36b5a0cfd491b2e82f411f262a3531a4e41f6152 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 9 Sep 2019 15:44:03 +0300 Subject: [PATCH] remove deprecated/insert more insistent warnings about deprecation GitOrigin-RevId: b19815cfd126dce856b70feb421776526b656819 --- .../searches/ClassInheritorsSearch.java | 1 + .../intellij/openapi/editor/FoldingModel.java | 2 ++ .../tree/injected/InjectedLanguageUtil.java | 2 +- ...pturingAnsiEscapesAwareProcessHandler.java | 9 ------- .../process/CapturingProcessHandler.java | 2 ++ .../fileTypes/impl/FileTypeManagerImpl.java | 2 +- .../com/intellij/usages/impl/UsageNode.java | 2 ++ .../execution/process/ProcessWaitFor.java | 2 ++ .../util/containers/ConcurrentFactoryMap.java | 25 +------------------ .../containers/ConcurrentWeakHashMap.java | 23 +---------------- .../util/containers/ContainerUtil.java | 9 ++----- .../intellij/util/containers/FactoryMap.java | 24 ++++++++---------- .../containers/WeakKeyWeakValueHashMap.java | 14 ++--------- .../com/intellij/util/io/BaseDataReader.java | 2 ++ 14 files changed, 29 insertions(+), 90 deletions(-) diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java index c63a289c626b..7a833e63b39f 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java @@ -170,6 +170,7 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory search(@NotNull final PsiClass aClass, @NotNull SearchScope scope, final boolean checkDeep, final boolean checkInheritance) { + DeprecatedMethodException.report("Use ClassInheritorsSearch.search(PsiClass, SearchScope, boolean, boolean, boolean) instead"); return search(aClass, scope, checkDeep, checkInheritance, true); } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/FoldingModel.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/FoldingModel.java index 07993d7e730f..aad6485a88bb 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/FoldingModel.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/FoldingModel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.editor; +import com.intellij.util.DeprecatedMethodException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -47,6 +48,7 @@ public interface FoldingModel { @ApiStatus.ScheduledForRemoval(inVersion = "2018") @Deprecated default boolean addFoldRegion(@NotNull FoldRegion region) { + DeprecatedMethodException.report("Use addFoldRegion(int,int,String) instead"); return true; } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java index 905c85aa3290..e79332ed9722 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java @@ -759,7 +759,7 @@ public class InjectedLanguageUtil { */ @Deprecated public static void putInjectedFileUserData(MultiHostRegistrar registrar, Key key, T value) { - DeprecatedMethodException.report("use #putInjectedFileUserData(com.intellij.psi.PsiElement, com.intellij.lang.Language, com.intellij.openapi.util.Key, java.lang.Object)} instead"); + DeprecatedMethodException.report("use putInjectedFileUserData(PsiElement, Language, Key, Object)} instead"); InjectionResult result = ((InjectionRegistrarImpl)registrar).getInjectedResult(); if (result != null && result.files != null) { List files = result.files; diff --git a/platform/platform-api/src/com/intellij/execution/process/CapturingAnsiEscapesAwareProcessHandler.java b/platform/platform-api/src/com/intellij/execution/process/CapturingAnsiEscapesAwareProcessHandler.java index 9677fc453be6..76ba85281c00 100644 --- a/platform/platform-api/src/com/intellij/execution/process/CapturingAnsiEscapesAwareProcessHandler.java +++ b/platform/platform-api/src/com/intellij/execution/process/CapturingAnsiEscapesAwareProcessHandler.java @@ -18,7 +18,6 @@ package com.intellij.execution.process; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.openapi.util.Key; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -31,14 +30,6 @@ public class CapturingAnsiEscapesAwareProcessHandler extends CapturingProcessHan super(commandLine); } - /** @deprecated Use {@link #CapturingAnsiEscapesAwareProcessHandler(Process, String)} instead (to be removed in IDEA 17) */ - @SuppressWarnings({"unused"}) - @Deprecated - @ApiStatus.ScheduledForRemoval(inVersion = "2017") - public CapturingAnsiEscapesAwareProcessHandler(Process process) { - super(process); - } - public CapturingAnsiEscapesAwareProcessHandler(@NotNull Process process, @NotNull String commandLine) { super(process, null, commandLine); } diff --git a/platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java b/platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java index 6bf70d34819b..ab5334c818d9 100644 --- a/platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java +++ b/platform/platform-api/src/com/intellij/execution/process/CapturingProcessHandler.java @@ -4,6 +4,7 @@ package com.intellij.execution.process; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.util.DeprecatedMethodException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,6 +29,7 @@ public class CapturingProcessHandler extends OSProcessHandler { @ApiStatus.ScheduledForRemoval(inVersion = "2017") public CapturingProcessHandler(@NotNull Process process) { this(process, null, ""); + DeprecatedMethodException.report("Use CapturingProcessHandler(Process, Charset, String) instead"); } /** diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java index 012f2d16c9dd..cacaeab598f8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeManagerImpl.java @@ -1206,8 +1206,8 @@ public class FileTypeManagerImpl extends FileTypeManagerEx implements Persistent } @Override + @Deprecated public void registerFileType(@NotNull FileType fileType) { - //noinspection deprecation registerFileType(fileType, ArrayUtilRt.EMPTY_STRING_ARRAY); } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageNode.java b/platform/usageView/src/com/intellij/usages/impl/UsageNode.java index 532b65671c74..9bb71f727aa2 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageNode.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageNode.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.Navigatable; import com.intellij.usages.Usage; import com.intellij.usages.UsageView; +import com.intellij.util.DeprecatedMethodException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -34,6 +35,7 @@ public class UsageNode extends Node implements Comparable, Navigatabl // todo remove in 2018.1 public UsageNode(@NotNull Usage usage, UsageViewTreeModelBuilder model) { this(null, usage); + DeprecatedMethodException.report("Use UsageNode(Node, Usage) instead"); } public UsageNode(Node parent, @NotNull Usage usage) { diff --git a/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java b/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java index 64b0fc194966..480529dc1447 100644 --- a/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java +++ b/platform/util/src/com/intellij/execution/process/ProcessWaitFor.java @@ -20,6 +20,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ConcurrencyUtil; import com.intellij.util.Consumer; +import com.intellij.util.DeprecatedMethodException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -37,6 +38,7 @@ public class ProcessWaitFor { @Deprecated public ProcessWaitFor(@NotNull final Process process, @NotNull TaskExecutor executor) { this(process, executor, ""); + DeprecatedMethodException.report("Use ProcessWaitFor(Process, TaskExecutor, String) instead"); } public ProcessWaitFor(@NotNull final Process process, @NotNull TaskExecutor executor, @NotNull final String presentableName) { diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java index 69543e63a586..4929549c86eb 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java @@ -31,7 +31,7 @@ public abstract class ConcurrentFactoryMap implements ConcurrentMap { DeprecatedMethodException.report("Use ConcurrentFactoryMap.create() instead"); } - private ConcurrentFactoryMap(@SuppressWarnings("unused") boolean internalConstructor) { + private ConcurrentFactoryMap(@SuppressWarnings("unused") boolean goodConstructorHereHaveABiscuit) { } @@ -187,29 +187,6 @@ public abstract class ConcurrentFactoryMap implements ConcurrentMap { }; } - /** - * @deprecated use {@link #create(Function, Supplier)} instead - */ - @Deprecated - @NotNull - public static ConcurrentMap createMap(@NotNull Function computeValue, - @NotNull Producer> mapCreator) { - DeprecatedMethodException.report("Use ConcurrentFactoryMap.create() instead"); - return new ConcurrentFactoryMap(true) { - @Nullable - @Override - protected V create(K key) { - return computeValue.fun(key); - } - - @NotNull - @Override - protected ConcurrentMap createMap() { - return mapCreator.produce(); - } - }; - } - @NotNull public static ConcurrentMap create(@NotNull Function computeValue, @NotNull Supplier> mapCreator) { diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java index 181a0415aa42..a9442220b73f 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java @@ -16,8 +16,6 @@ package com.intellij.util.containers; -import com.intellij.util.DeprecatedMethodException; -import com.intellij.util.Function; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; @@ -28,10 +26,8 @@ import java.lang.ref.WeakReference; * Concurrent weak key:K -> strong value:V map. * Null keys are allowed * Null values are NOT allowed - * @deprecated Use {@link ContainerUtil#createConcurrentWeakMap()} instead */ -@Deprecated -public final class ConcurrentWeakHashMap extends ConcurrentRefHashMap { +final class ConcurrentWeakHashMap extends ConcurrentRefHashMap { private static class WeakKey extends WeakReference implements KeyReference { private final int myHash; /* Hashcode of key, stored here since the key may be tossed by the GC */ @NotNull private final TObjectHashingStrategy myStrategy; @@ -69,23 +65,6 @@ public final class ConcurrentWeakHashMap extends ConcurrentRefHashMap(key, hashingStrategy.computeHashCode(key), hashingStrategy, myReferenceQueue); } - /** - * @deprecated use {@link ConcurrentFactoryMap#createWeakMap(Function)} - */ - @Deprecated - public ConcurrentWeakHashMap(int initialCapacity) { - super(initialCapacity); - DeprecatedMethodException.report("Use com.intellij.util.containers.ConcurrentFactoryMap.createWeakMap instead"); - } - - /** - * @deprecated use {@link ConcurrentFactoryMap#createWeakMap(Function)} - */ - @Deprecated - public ConcurrentWeakHashMap() { - DeprecatedMethodException.report("Use com.intellij.util.containers.ConcurrentFactoryMap.createWeakMap instead"); - } - ConcurrentWeakHashMap(float loadFactor) { this(DEFAULT_CAPACITY, loadFactor, DEFAULT_CONCURRENCY_LEVEL, ContainerUtil.canonicalStrategy()); } diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index e2f770a56693..269cb4562863 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -2698,7 +2698,6 @@ public class ContainerUtil extends ContainerUtilRt { @NotNull @Contract(value = " -> new", pure = true) public static ConcurrentMap createConcurrentWeakMap() { - //noinspection deprecation return new ConcurrentWeakHashMap<>(0.75f); } @@ -2717,14 +2716,12 @@ public class ContainerUtil extends ContainerUtilRt { float loadFactor, int concurrencyLevel, @NotNull TObjectHashingStrategy hashingStrategy) { - //noinspection deprecation return new ConcurrentWeakHashMap<>(initialCapacity, loadFactor, concurrencyLevel, hashingStrategy); } @NotNull @Contract(value = "_ -> new", pure = true) public static ConcurrentMap createConcurrentWeakMap(@NotNull TObjectHashingStrategy hashingStrategy) { - //noinspection deprecation return new ConcurrentWeakHashMap<>(hashingStrategy); } @@ -2994,15 +2991,13 @@ public class ContainerUtil extends ContainerUtilRt { @Contract(value = " -> new", pure = true) @NotNull public static Map createWeakKeyWeakValueMap() { - //noinspection deprecation - return new WeakKeyWeakValueHashMap<>(true); + return new WeakKeyWeakValueHashMap<>(); } @Contract(value = " -> new", pure = true) @NotNull public static Map createSoftKeySoftValueMap() { - //noinspection deprecation - return new SoftKeySoftValueHashMap<>(true); + return new SoftKeySoftValueHashMap<>(); } /** diff --git a/platform/util/src/com/intellij/util/containers/FactoryMap.java b/platform/util/src/com/intellij/util/containers/FactoryMap.java index 8c51cd00d098..1486d1dd22de 100644 --- a/platform/util/src/com/intellij/util/containers/FactoryMap.java +++ b/platform/util/src/com/intellij/util/containers/FactoryMap.java @@ -17,10 +17,10 @@ package com.intellij.util.containers; import com.intellij.openapi.util.RecursionGuard; import com.intellij.openapi.util.RecursionManager; +import com.intellij.util.DeprecatedMethodException; import com.intellij.util.Function; import com.intellij.util.ObjectUtils; import gnu.trove.THashMap; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -41,8 +41,13 @@ public abstract class FactoryMap implements Map { */ @Deprecated public FactoryMap() { + DeprecatedMethodException.report("Use FactoryMap.create*() instead"); } + private FactoryMap(boolean safe) { + } + + @NotNull protected Map createMap() { return new THashMap<>(); @@ -58,6 +63,7 @@ public abstract class FactoryMap implements Map { V value = map.get(k); if (value == null) { RecursionGuard.StackStamp stamp = RecursionManager.markStack(); + //noinspection unchecked value = create((K)key); if (stamp.mayCacheNow()) { V v = notNull(value); @@ -82,7 +88,7 @@ public abstract class FactoryMap implements Map { private static T notNull(final Object key) { //noinspection unchecked - return key == null ? FactoryMap.FAKE_NULL() : (T)key; + return key == null ? FAKE_NULL() : (T)key; } @Nullable private static T nullize(T value) { @@ -169,19 +175,9 @@ public abstract class FactoryMap implements Map { entry -> new AbstractMap.SimpleEntry<>(nullize(entry.getKey()), nullize(entry.getValue()))); } - /** - * @deprecated Use {@link #create(Function)} instead. TODO to be removed in IDEA 2018 - */ - @ApiStatus.ScheduledForRemoval(inVersion = "2018") - @Deprecated - @NotNull - public static FactoryMap createMap(@NotNull final Function computeValue) { - return (FactoryMap)create(computeValue); - } - @NotNull public static Map create(@NotNull final Function computeValue) { - return new FactoryMap() { + return new FactoryMap(true) { @Nullable @Override protected V create(K key) { @@ -192,7 +188,7 @@ public abstract class FactoryMap implements Map { @NotNull public static Map createMap(@NotNull final Function computeValue, @NotNull final Supplier> mapCreator) { - return new FactoryMap() { + return new FactoryMap(true) { @Nullable @Override protected V create(K key) { diff --git a/platform/util/src/com/intellij/util/containers/WeakKeyWeakValueHashMap.java b/platform/util/src/com/intellij/util/containers/WeakKeyWeakValueHashMap.java index 0eee205f2cfc..625ac4e69cf8 100644 --- a/platform/util/src/com/intellij/util/containers/WeakKeyWeakValueHashMap.java +++ b/platform/util/src/com/intellij/util/containers/WeakKeyWeakValueHashMap.java @@ -15,24 +15,14 @@ */ package com.intellij.util.containers; -import com.intellij.util.DeprecatedMethodException; import org.jetbrains.annotations.NotNull; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.Map; -/** - * @deprecated use {@link ContainerUtil#createWeakKeyWeakValueMap()} instead - */ -@Deprecated -public final class WeakKeyWeakValueHashMap extends RefKeyRefValueHashMap implements Map{ - public WeakKeyWeakValueHashMap() { - this(false); - DeprecatedMethodException.report("Use ContainerUtil#createWeakKeyWeakValueMap() instead"); - } - - WeakKeyWeakValueHashMap(boolean good) { +final class WeakKeyWeakValueHashMap extends RefKeyRefValueHashMap implements Map{ + WeakKeyWeakValueHashMap() { super((RefHashMap>)ContainerUtil.>createWeakMap()); } diff --git a/platform/util/src/com/intellij/util/io/BaseDataReader.java b/platform/util/src/com/intellij/util/io/BaseDataReader.java index cbae698e0893..42e6f000342d 100644 --- a/platform/util/src/com/intellij/util/io/BaseDataReader.java +++ b/platform/util/src/com/intellij/util/io/BaseDataReader.java @@ -18,6 +18,7 @@ package com.intellij.util.io; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ConcurrencyUtil; +import com.intellij.util.DeprecatedMethodException; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -47,6 +48,7 @@ public abstract class BaseDataReader { @Deprecated @ApiStatus.ScheduledForRemoval(inVersion = "2017") protected void start() { + DeprecatedMethodException.report("Use start(String) instead"); start(""); }