IDEA-161260 Migration to findFirst(): Support more expression kinds in the last return statement

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstEnum.java

@@ -0,0 +1,13 @@
+// "Replace with findFirst()" "true"
+
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+
+public class Main {
+  enum MyEnum { FOO, BAR, BAZ }
+
+  public static MyEnum find(List<EnumSet<MyEnum>> list) {
+      return list.stream().flatMap(Collection::stream).filter(val -> val.name().startsWith("B")).findFirst().orElse(MyEnum.FOO);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstField.java

@@ -0,0 +1,14 @@
+// "Replace with findFirst()" "true"
+
+import java.awt.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+public class Main {
+  private Point field = new Point(0, 0);
+
+  public Point find(List<Point> points) {
+      return points.stream().filter((Predicate<Point>) Objects::nonNull).findFirst().orElse(field);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/afterFindFirstStaticField.java

@@ -0,0 +1,14 @@
+// "Replace with findFirst()" "true"
+
+import java.awt.*;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+public class Main {
+  private static Point ZERO = new Point(0, 0);
+
+  public static Point find(List<Point> points) {
+      return points.stream().filter((Predicate<Point>) Objects::nonNull).findFirst().orElse(ZERO);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstCall.java

@@ -0,0 +1,13 @@
+// "Replace with findFirst()" "false"
+
+import java.awt.*;
+import java.util.List;
+
+public class Main {
+  public Point find(List<Point> points, Main other) {
+    for (Point pt : poin<caret>ts) {
+      if (pt != null) return pt;
+    }
+    return new Point(0, 0);
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstEnum.java

@@ -0,0 +1,19 @@
+// "Replace with findFirst()" "true"
+
+import java.util.EnumSet;
+import java.util.List;
+
+public class Main {
+  enum MyEnum { FOO, BAR, BAZ }
+
+  public static MyEnum find(List<EnumSet<MyEnum>> list) {
+    for (EnumSet<MyEnum> set : lis<caret>t) {
+      for (MyEnum val : set) {
+        if (val.name().startsWith("B")) {
+          return val;
+        }
+      }
+    }
+    return MyEnum.FOO;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstField.java

@@ -0,0 +1,15 @@
+// "Replace with findFirst()" "true"
+
+import java.awt.*;
+import java.util.List;
+
+public class Main {
+  private Point field = new Point(0, 0);
+
+  public Point find(List<Point> points) {
+    for (Point pt : poin<caret>ts) {
+      if (pt != null) return pt;
+    }
+    return field;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstFieldOther.java

@@ -0,0 +1,15 @@
+// "Replace with findFirst()" "false"
+
+import java.awt.*;
+import java.util.List;
+
+public class Main {
+  private Point field = new Point(0, 0);
+
+  public Point find(List<Point> points, Main other) {
+    for (Point pt : poin<caret>ts) {
+      if (pt != null) return pt;
+    }
+    return other.field;
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/beforeFindFirstStaticField.java

@@ -0,0 +1,15 @@
+// "Replace with findFirst()" "true"
+
+import java.awt.*;
+import java.util.List;
+
+public class Main {
+  private static Point ZERO = new Point(0, 0);
+
+  public static Point find(List<Point> points) {
+    for (Point pt : point<caret>s) {
+      if (pt != null) return pt;
+    }
+    return ZERO;
+  }
+}