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

guava inspection: migrate Optional.fromNullable chains (IDEA-160227)

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-08-26 15:54:25 +03:00
parent 51b85d1dd6
commit a0dcb10ff9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaFluentIterableConversionRule.java
+3 -2
View File
@@ -51,7 +51,7 @@ public class GuavaFluentIterableConversionRule extends BaseGuavaTypeConversionRu
private static final Map<String, TypeConversionDescriptorFactory> DESCRIPTORS_MAP =
new HashMap<>();
public static final Set<String> CHAIN_HEAD_METHODS = ContainerUtil.newHashSet("from", "of");
public static final Set<String> CHAIN_HEAD_METHODS = ContainerUtil.newHashSet("from", "of", "fromNullable");
public static final String FLUENT_ITERABLE = "com.google.common.collect.FluentIterable";
public static final String STREAM_COLLECT_TO_LIST = "$it$.collect(java.util.stream.Collectors.toList())";
@@ -352,7 +352,8 @@ public class GuavaFluentIterableConversionRule extends BaseGuavaTypeConversionRu
return null;
}
final PsiClass aClass = method.getContainingClass();
if (aClass == null || !FLUENT_ITERABLE.equals(aClass.getQualifiedName())) {
if (aClass == null || !(FLUENT_ITERABLE.equals(aClass.getQualifiedName()) ||
GuavaOptionalConversionRule.GUAVA_OPTIONAL.equals(aClass.getQualifiedName()))) {
return null;
}
break;