guava type migration: improve template for guava's Optional#asSet() (IDEA-167813)

This commit is contained in:
Dmitry Batkovich
2017-02-09 13:13:54 +03:00
parent 775d1a3b0d
commit acebed8e8f
2 changed files with 2 additions and 2 deletions
@@ -157,7 +157,7 @@ public class GuavaOptionalConversionRule extends BaseGuavaTypeConversionRule {
descriptorsMap.put("isPresent", identity);
descriptorsMap.put("orNull", new TypeConversionDescriptor("$val$.orNull()", "$val$.orElse(null)"));
descriptorsMap.put("asSet", new TypeConversionDescriptor("$val$.asSet()",
"$val$.isPresent() ? java.util.Collections.singleton($val$.get()) : java.util.Collections.emptySet()"));
"$val$.map(java.util.Collections::singleton).orElse(java.util.Collections.emptySet())"));
}
@NotNull
@@ -13,7 +13,7 @@ class A {
System.out.println(o.get());
}
System.out.println(o.orElse(null));
Set<String> set = o.isPresent() ? Collections.singleton(o.get()) : Collections.emptySet();
Set<String> set = o.map(Collections::singleton).orElse(Collections.emptySet());
}
}