MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

mark as "Obsolete" some Consumer-related classes, get rid of a couple of Consumers

Browse Source 
GitOrigin-RevId: 18309c8af28960428136b6f14f39a76ce921334d
This commit is contained in:
Alexey Kudravtsev
2023-03-13 15:54:49 +00:00
committed by intellij-monorepo-bot
parent 21ebb72ec3
commit b7bbc6335d
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JpsJavaDependenciesRootsEnumeratorImpl.java
+7 -6
View File
@@ -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<JpsJavaDependenciesEnumeratorImpl> 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);
}
}
}
jps/model-impl/src/org/jetbrains/jps/model/module/impl/JpsDependenciesRootsEnumeratorBase.java
+2 -2
View File
@@ -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<E extends JpsDependenciesEnumeratorBase<?>> implements JpsDependenciesRootsEnumerator {
protected final JpsOrderRootType myRootType;
@@ -83,7 +83,7 @@ public abstract class JpsDependenciesRootsEnumeratorBase<E extends JpsDependenci
private boolean processLibraryRootUrls(JpsLibrary library, Consumer<? super String> urlConsumer) {
for (String url : library.getRootUrls(myRootType)) {
urlConsumer.consume(url);
urlConsumer.accept(url);
}
return true;
}
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateUtil.java
+2 -2
View File
@@ -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();
platform/lang-impl/src/com/intellij/platform/templates/TemplateModuleBuilder.java
+2 -2
View File
@@ -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<Trinity<String, String, VelocityException>> myFailures = new SmartList<>();
@Override
public void consume(VelocityException e) {
public void accept(VelocityException e) {
myFailures.add(Trinity.create(myPath, myText, e));
}
platform/util-rt/src/com/intellij/util/NullableConsumer.java
+2
View File
@@ -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<T> extends Consumer<T> {
void consume(@Nullable T t);
}
platform/util/src/com/intellij/util/CatchingConsumer.java
+3
View File
@@ -15,6 +15,9 @@
*/
package com.intellij.util;
import org.jetbrains.annotations.ApiStatus;
@ApiStatus.Obsolete
public interface CatchingConsumer<T, E extends Throwable> extends Consumer<T> {
void consume(E e);
}
platform/util/src/com/intellij/util/ObjectUtils.java
+2 -1
View File
@@ -142,8 +142,9 @@ public final class ObjectUtils {
}
/**
* Do not use in Kotlin.
* Use {@code if (obj != null) ...} instead
*/
@Deprecated
public static <T> void consumeIfNotNull(@Nullable T obj, @NotNull Consumer<? super T> consumer) {
if (obj != null) {
consumer.consume(obj);