From 59537adb7f1594d4133aa8f59d94bb6a08bf1361 Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 19 Nov 2015 19:25:42 +0300 Subject: [PATCH] guave type migration: remove method reference in not need for Predicate --- .../rules/guava/GuavaPredicateConversionRule.java | 3 ++- .../rules/guava/LambdaParametersTypeConversionDescriptor.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicateConversionRule.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicateConversionRule.java index 6848ccd8d61a..cb6ea3326c52 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicateConversionRule.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicateConversionRule.java @@ -31,6 +31,7 @@ import java.util.Map; */ public class GuavaPredicateConversionRule extends BaseGuavaTypeConversionRule { public static final String GUAVA_PREDICATE = "com.google.common.base.Predicate"; + public static final String JAVA_PREDICATE = "java.util.function.Predicate"; @Override protected void fillSimpleDescriptors(Map descriptorsMap) { @@ -53,6 +54,6 @@ public class GuavaPredicateConversionRule extends BaseGuavaTypeConversionRule { @NotNull @Override public String ruleToClass() { - return "java.util.function.Predicate"; + return JAVA_PREDICATE; } } diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/LambdaParametersTypeConversionDescriptor.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/LambdaParametersTypeConversionDescriptor.java index b2f16c5c662e..9bee8c087bf3 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/LambdaParametersTypeConversionDescriptor.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/LambdaParametersTypeConversionDescriptor.java @@ -85,7 +85,8 @@ public class LambdaParametersTypeConversionDescriptor extends TypeConversionDesc final PsiClass qualifierClass = PsiTypesUtil.getPsiClass(qualifierType); if (qualifierClass != null && (Comparing.equal(qualifierClass.getQualifiedName(), GuavaFunctionConversionRule.JAVA_UTIL_FUNCTION_FUNCTION) || Comparing.equal(qualifierClass.getQualifiedName(), GuavaOptionalConversionRule.JAVA_OPTIONAL) || - Comparing.equal(qualifierClass.getQualifiedName(), GuavaSupplierConversionRule.JAVA_SUPPLIER))) + Comparing.equal(qualifierClass.getQualifiedName(), GuavaSupplierConversionRule.JAVA_SUPPLIER) || + Comparing.equal(qualifierClass.getQualifiedName(), GuavaPredicateConversionRule.JAVA_PREDICATE))) return (PsiExpression)expression.replace(qualifier); } }