From b7bbc6335d0974d15552f12d263e754fd1b06872 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 13 Mar 2023 14:07:17 +0100 Subject: [PATCH] mark as "Obsolete" some Consumer-related classes, get rid of a couple of Consumers GitOrigin-RevId: 18309c8af28960428136b6f14f39a76ce921334d --- .../JpsJavaDependenciesRootsEnumeratorImpl.java | 13 +++++++------ .../impl/JpsDependenciesRootsEnumeratorBase.java | 4 ++-- .../ide/fileTemplates/FileTemplateUtil.java | 4 ++-- .../platform/templates/TemplateModuleBuilder.java | 4 ++-- .../src/com/intellij/util/NullableConsumer.java | 2 ++ .../src/com/intellij/util/CatchingConsumer.java | 3 +++ .../util/src/com/intellij/util/ObjectUtils.java | 3 ++- 7 files changed, 20 insertions(+), 13 deletions(-) diff --git a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependenciesRootsEnumeratorImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependenciesRootsEnumeratorImpl.java index 4ec2ccea71a6..f06d89f9d7a9 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependenciesRootsEnumeratorImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependenciesRootsEnumeratorImpl.java @@ -15,12 +15,13 @@ */ package org.jetbrains.jps.model.java.impl; -import com.intellij.util.Consumer; import org.jetbrains.jps.model.java.*; import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.model.module.*; import org.jetbrains.jps.model.module.impl.JpsDependenciesRootsEnumeratorBase; +import java.util.function.Consumer; + public class JpsJavaDependenciesRootsEnumeratorImpl extends JpsDependenciesRootsEnumeratorBase implements JpsJavaDependenciesRootsEnumerator { private boolean myWithoutSelfModuleOutput; @@ -52,7 +53,7 @@ public class JpsJavaDependenciesRootsEnumeratorImpl extends JpsDependenciesRoots for (JpsModuleSourceRoot root : module.getSourceRoots()) { JpsModuleSourceRootType type = root.getRootType(); if (type.equals(JavaSourceRootType.SOURCE) && includeProduction || type.equals(JavaSourceRootType.TEST_SOURCE) && includeTests) { - urlConsumer.consume(root.getUrl()); + urlConsumer.accept(root.getUrl()); } } } @@ -62,7 +63,7 @@ public class JpsJavaDependenciesRootsEnumeratorImpl extends JpsDependenciesRoots if (includeProduction && includeTests) { String url = extensionService.getOutputUrl(module, false); if (url != null) { - urlConsumer.consume(url); + urlConsumer.accept(url); } } } @@ -71,11 +72,11 @@ public class JpsJavaDependenciesRootsEnumeratorImpl extends JpsDependenciesRoots if (includeTests) { String testsOutputUrl = extensionService.getOutputUrl(module, true); if (testsOutputUrl != null && !testsOutputUrl.equals(outputUrl)) { - urlConsumer.consume(testsOutputUrl); + urlConsumer.accept(testsOutputUrl); } } if (includeProduction && outputUrl != null) { - urlConsumer.consume(outputUrl); + urlConsumer.accept(outputUrl); } } } @@ -83,7 +84,7 @@ public class JpsJavaDependenciesRootsEnumeratorImpl extends JpsDependenciesRoots JpsJavaModuleExtension extension = JpsJavaExtensionService.getInstance().getModuleExtension(module); if (extension != null) { for (String url : extension.getAnnotationRoots().getUrls()) { - urlConsumer.consume(url); + urlConsumer.accept(url); } } } diff --git a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesRootsEnumeratorBase.java b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesRootsEnumeratorBase.java index af85b3b8bf86..6bd0cfa0fbf1 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesRootsEnumeratorBase.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesRootsEnumeratorBase.java @@ -16,7 +16,6 @@ package org.jetbrains.jps.model.module.impl; import com.intellij.util.CollectConsumer; -import com.intellij.util.Consumer; import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.model.module.*; @@ -26,6 +25,7 @@ import java.io.File; import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; +import java.util.function.Consumer; public abstract class JpsDependenciesRootsEnumeratorBase> implements JpsDependenciesRootsEnumerator { protected final JpsOrderRootType myRootType; @@ -83,7 +83,7 @@ public abstract class JpsDependenciesRootsEnumeratorBase urlConsumer) { for (String url : library.getRootUrls(myRootType)) { - urlConsumer.consume(url); + urlConsumer.accept(url); } return true; } diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java index 74e853c2d0cf..8076b411a426 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java @@ -24,7 +24,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; import com.intellij.util.ArrayUtilRt; -import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import org.apache.velocity.VelocityContext; @@ -40,6 +39,7 @@ import javax.swing.*; import java.io.StringReader; import java.io.StringWriter; import java.util.*; +import java.util.function.Consumer; import java.util.regex.Pattern; public final class FileTemplateUtil { @@ -223,7 +223,7 @@ public final class FileTemplateUtil { IdeBundle.message("title.velocity.error"))); } else { - exceptionHandler.consume(e); + exceptionHandler.accept(e); } } final String result = stringWriter.toString(); diff --git a/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java b/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java index 9f0397d1ca91..726945773b02 100644 --- a/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java +++ b/platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java @@ -42,7 +42,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingProjectManager; import com.intellij.openapi.vfs.newvfs.RefreshQueue; import com.intellij.platform.templates.github.ZipUtil; -import com.intellij.util.Consumer; import com.intellij.util.ExceptionUtil; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; @@ -65,6 +64,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Properties; +import java.util.function.Consumer; import java.util.stream.Stream; import java.util.zip.ZipInputStream; @@ -236,7 +236,7 @@ public class TemplateModuleBuilder extends ModuleBuilder { private final SmartList> myFailures = new SmartList<>(); @Override - public void consume(VelocityException e) { + public void accept(VelocityException e) { myFailures.add(Trinity.create(myPath, myText, e)); } diff --git a/platform/util-rt/src/com/intellij/util/NullableConsumer.java b/platform/util-rt/src/com/intellij/util/NullableConsumer.java index f8fbd7836b60..e86ce02ca5b7 100644 --- a/platform/util-rt/src/com/intellij/util/NullableConsumer.java +++ b/platform/util-rt/src/com/intellij/util/NullableConsumer.java @@ -1,11 +1,13 @@ // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.util; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; /** * Deprecated. Use {@link java.util.function.Consumer} with {@code @Nullable} annotation on the type parameter instead. */ +@ApiStatus.Obsolete public interface NullableConsumer extends Consumer { void consume(@Nullable T t); } diff --git a/platform/util/src/com/intellij/util/CatchingConsumer.java b/platform/util/src/com/intellij/util/CatchingConsumer.java index dc40bcbdd89e..ddb222af80e5 100644 --- a/platform/util/src/com/intellij/util/CatchingConsumer.java +++ b/platform/util/src/com/intellij/util/CatchingConsumer.java @@ -15,6 +15,9 @@ */ package com.intellij.util; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Obsolete public interface CatchingConsumer extends Consumer { void consume(E e); } diff --git a/platform/util/src/com/intellij/util/ObjectUtils.java b/platform/util/src/com/intellij/util/ObjectUtils.java index ad6d803590fd..7ea3b65f5f08 100644 --- a/platform/util/src/com/intellij/util/ObjectUtils.java +++ b/platform/util/src/com/intellij/util/ObjectUtils.java @@ -142,8 +142,9 @@ public final class ObjectUtils { } /** - * Do not use in Kotlin. + * Use {@code if (obj != null) ...} instead */ + @Deprecated public static void consumeIfNotNull(@Nullable T obj, @NotNull Consumer consumer) { if (obj != null) { consumer.consume(obj);