From 252afcd0dfd47f967f14039c9e9659e07430bb34 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 24 Jul 2019 19:19:17 +0300
Subject: [PATCH] remove deprecated method usages
(cherry picked from commit e60b4c37a7fab09fbf3933760968ca19e2f2edd3)
(cherry picked from commit 01a4b7c5fcf4bbbbe7b20c69178ed2ac97aac6c2)
GitOrigin-RevId: aebb2dc44171ded16279ddcaa3bd3fa7222d9f0c
---
.../psi/impl/file/impl/ResolveScopeManagerImpl.java | 2 +-
.../execution/console/DefaultConsoleHistoryModel.java | 2 +-
.../lang-impl/src/com/intellij/mock/MockFileManager.java | 2 +-
.../src/com/intellij/slicer/SliceLeafAnalyzer.java | 2 +-
.../openapi/vfs/ex/dummy/DummyCachingFileSystem.java | 2 +-
.../src/com/intellij/util/DeprecatedMethodException.java | 3 +--
.../com/intellij/util/containers/ConcurrentFactoryMap.java | 7 +++++--
.../intellij/util/xml/impl/DomApplicationComponent.java | 2 +-
8 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
index bb90237a761a..60dd4cca58a4 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
@@ -38,7 +38,7 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager {
myManager = psiManager;
myAdditionalIndexableFileSet = new AdditionalIndexableFileSet(project);
- myDefaultResolveScopesCache = ConcurrentFactoryMap.createMap(
+ myDefaultResolveScopesCache = ConcurrentFactoryMap.create(
key -> {
GlobalSearchScope scope = null;
for (ResolveScopeProvider resolveScopeProvider : ResolveScopeProvider.EP_NAME.getExtensionList()) {
diff --git a/platform/lang-impl/src/com/intellij/execution/console/DefaultConsoleHistoryModel.java b/platform/lang-impl/src/com/intellij/execution/console/DefaultConsoleHistoryModel.java
index 21a2518e5c99..f3f110ff06d8 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/DefaultConsoleHistoryModel.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/DefaultConsoleHistoryModel.java
@@ -20,7 +20,7 @@ import java.util.Map;
public class DefaultConsoleHistoryModel extends SimpleModificationTracker implements ConsoleHistoryModel {
private final static Map<String, DefaultConsoleHistoryModel> ourModels =
- ConcurrentFactoryMap.createMap(key -> new DefaultConsoleHistoryModel(null),
+ ConcurrentFactoryMap.create(key -> new DefaultConsoleHistoryModel(null),
ContainerUtil::createConcurrentWeakValueMap);
public static DefaultConsoleHistoryModel createModel(String persistenceId) {
diff --git a/platform/lang-impl/src/com/intellij/mock/MockFileManager.java b/platform/lang-impl/src/com/intellij/mock/MockFileManager.java
index f404b8bc3451..8175eb0485f2 100644
--- a/platform/lang-impl/src/com/intellij/mock/MockFileManager.java
+++ b/platform/lang-impl/src/com/intellij/mock/MockFileManager.java
@@ -47,7 +47,7 @@ public class MockFileManager implements FileManager {
public MockFileManager(PsiManagerEx manager) {
myManager = manager;
- myViewProviders = ConcurrentFactoryMap.createMap(key->new SingleRootFileViewProvider(myManager, key), ContainerUtil::createConcurrentWeakKeyWeakValueMap);
+ myViewProviders = ConcurrentFactoryMap.create(key->new SingleRootFileViewProvider(myManager, key), ContainerUtil::createConcurrentWeakKeyWeakValueMap);
}
@Override
diff --git a/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java b/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
index f2c3cfb5b22b..be8af9931072 100644
--- a/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
+++ b/platform/lang-impl/src/com/intellij/slicer/SliceLeafAnalyzer.java
@@ -162,7 +162,7 @@ public class SliceLeafAnalyzer {
}
public Map<SliceNode, Collection<PsiElement>> createMap() {
- return ConcurrentFactoryMap.createMap(k -> ConcurrentCollectionFactory.createConcurrentSet(myLeafEquality),
+ return ConcurrentFactoryMap.create(k -> ConcurrentCollectionFactory.createConcurrentSet(myLeafEquality),
() -> ConcurrentCollectionFactory.createMap(ContainerUtil.identityStrategy()));
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java
index e43bd2a7e68a..996fddc108c2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/dummy/DummyCachingFileSystem.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
*/
public abstract class DummyCachingFileSystem<T extends VirtualFile> extends DummyFileSystem {
private final String myProtocol;
- private final ConcurrentMap<String, T> myCachedFiles = ConcurrentFactoryMap.createMap(
+ private final ConcurrentMap<String, T> myCachedFiles = ConcurrentFactoryMap.create(
this::findFileByPathInner, ContainerUtil::createConcurrentWeakValueMap);
public DummyCachingFileSystem(String protocol) {
diff --git a/platform/util/src/com/intellij/util/DeprecatedMethodException.java b/platform/util/src/com/intellij/util/DeprecatedMethodException.java
index e522bf26d3c2..63bdb0b3a20a 100644
--- a/platform/util/src/com/intellij/util/DeprecatedMethodException.java
+++ b/platform/util/src/com/intellij/util/DeprecatedMethodException.java
@@ -6,12 +6,11 @@ import org.jetbrains.annotations.NotNull;
public class DeprecatedMethodException extends RuntimeException {
private static final Logger LOG = Logger.getInstance(DeprecatedMethodException.class);
- private DeprecatedMethodException(String message) {
+ private DeprecatedMethodException(@NotNull String message) {
super(message);
}
public static void report(@NotNull String message) {
-
LOG.warn(new DeprecatedMethodException("This method in " + ReflectionUtil.findCallerClass(2) +
" is deprecated and going to be removed soon. "+message));
}
diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java
index e2e539f71a66..0e4f6d3172d6 100644
--- a/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java
+++ b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java
@@ -188,7 +188,9 @@ public abstract class ConcurrentFactoryMap<K,V> implements ConcurrentMap<K,V> {
*/
@Deprecated
@NotNull
- public static <K, V> ConcurrentMap<K, V> createMap(@NotNull final Function<? super K, ? extends V> computeValue, @NotNull final Producer<? extends ConcurrentMap<K, V>> mapCreator) {
+ public static <K, V> ConcurrentMap<K, V> createMap(@NotNull Function<? super K, ? extends V> computeValue,
+ @NotNull Producer<? extends ConcurrentMap<K, V>> mapCreator) {
+ DeprecatedMethodException.report("Use ConcurrentFactoryMap.create() instead");
return new ConcurrentFactoryMap<K, V>(true) {
@Nullable
@Override
@@ -205,7 +207,8 @@ public abstract class ConcurrentFactoryMap<K,V> implements ConcurrentMap<K,V> {
}
@NotNull
- public static <K, V> ConcurrentMap<K, V> create(@NotNull final Function<? super K, ? extends V> computeValue, @NotNull final Supplier<? extends ConcurrentMap<K, V>> mapCreator) {
+ public static <K, V> ConcurrentMap<K, V> create(@NotNull Function<? super K, ? extends V> computeValue,
+ @NotNull Supplier<? extends ConcurrentMap<K, V>> mapCreator) {
return new ConcurrentFactoryMap<K, V>(true) {
@Nullable
@Override
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
index ff575e86b4c4..be563d9a10a9 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomApplicationComponent.java
@@ -36,7 +36,7 @@ public class DomApplicationComponent {
}
);
- private final Map<Class, InvocationCache> myInvocationCaches = ConcurrentFactoryMap.createMap(InvocationCache::new,
+ private final Map<Class, InvocationCache> myInvocationCaches = ConcurrentFactoryMap.create(InvocationCache::new,
ContainerUtil::createConcurrentSoftValueMap);
private final Map<Class<? extends DomElementVisitor>, VisitorDescription> myVisitorDescriptions =
ConcurrentFactoryMap.createMap(VisitorDescription::new);
--
GitLab