SimplifyOptionalCallChainsInspection.RewrappingCase: check orElse argument (IDEA-220982)

Also disabled for `orElseGet(() -> null)` as it would require more logic to check the lambda content and we already suggest to replace this with `orElse(null)`

GitOrigin-RevId: ec86f715ef0f78c637447d5379a239016ecfd3b6

java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java

@@ -470,9 +470,12 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI
           !EquivalenceChecker.getCanonicalPsiEquivalence().typesAreEquivalent(qualifier.getType(), parentCall.getType())) {
         return null;
       }
-      if ("get".equals(call.getMethodExpression().getReferenceName())) {
+      String name = call.getMethodExpression().getReferenceName();
+      if ("get".equals(name)) {
         SpecialFieldValue fact = CommonDataflow.getExpressionFact(qualifier, DfaFactType.SPECIAL_FIELD_VALUE);
         if (DfaFactType.NULLABILITY.fromDfaValue(SpecialField.OPTIONAL_VALUE.extract(fact)) != DfaNullability.NOT_NULL) return null;
+      } else if ("orElse".equals(name)) {
+        if (!ExpressionUtils.isNullLiteral(call.getArgumentList().getExpressions()[0])) return null;
       }
       return new Context(qualifier, parentCall);
     }
@@ -490,7 +493,7 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI
       if (myType == Type.OptionalGet) {
         return OPTIONAL_GET;
       }
-      return OPTIONAL_OR_ELSE_OR_ELSE_GET;
+      return OPTIONAL_OR_ELSE;
     }
 
     private static class Context {

java/java-tests/testData/inspection/optionalChains/afterRewrapOrElseGet.java

@@ -1,8 +0,0 @@
-// "Unwrap" "true"
-import java.util.*;
-
-public class Tests {
-  void test(List<String> list) {
-    Optional<String> opt = list.stream().filter(Objects::nonNull).findFirst();
-  }
-}

java/java-tests/testData/inspection/optionalChains/beforeRewrapNotNull.java

@@ -0,0 +1,8 @@
+// "Unwrap" "false"
+import java.util.*;
+
+public class Tests {
+  private Optional<String> test(Optional<String> testOptional, String defaultVal) {
+    return Optional.ofNullable(testOptional.or<caret>Else(defaultVal));
+  }
+}

java/java-tests/testData/inspection/optionalChains/beforeRewrapOrElseGet.java

@@ -1,8 +1,10 @@
-// "Unwrap" "true"
+// "Unwrap" "false"
 import java.util.*;
 
 public class Tests {
   void test(List<String> list) {
+    // Will be reported as "Excessive lambda usage", changing to orElse which will trigger rewrapping inspection
+    // no need to do this in single step
     Optional<String> opt = Optional.ofNullable(list.stream().filter(Objects::nonNull).findFirst().<caret>orElseGet(() -> null));
   }
 }