Add Objects.requireNonNullElse/ElseGet support to AnnotateNullableParameters

src/main/java/org/openrewrite/staticanalysis/AnnotateNullableParameters.java

@@ -167,6 +167,8 @@ private Map<J.VariableDeclarations, J.Identifier> buildIdentifierMap(List<J.Vari
      * <ul>
      *   <li>Direct null comparisons (param == null, param != null)</li>
      *   <li>Known null-checking method calls (Objects.isNull, StringUtils.isBlank, etc.)</li>
+     *   <li>Methods that provide default values for null parameters (Objects.requireNonNullElse, Objects.requireNonNullElseGet)</li>
+     *   <li>Methods that handle nullable values (Optional.ofNullable)</li>
      *   <li>Negated null-checking method calls (!Objects.isNull, !StringUtils.isBlank, etc.)</li>
      * </ul>
      */
@@ -175,6 +177,9 @@ private static class NullCheckVisitor extends JavaIsoVisitor<Set<J.Identifier>>
                 new MethodMatcher("com.google.common.base.Strings isNullOrEmpty(..)"), // Guava
                 new MethodMatcher("java.util.Objects isNull(..)"),
                 new MethodMatcher("java.util.Objects nonNull(..)"),
+                new MethodMatcher("java.util.Objects requireNonNullElse(..)"), // Provides default for null
+                new MethodMatcher("java.util.Objects requireNonNullElseGet(..)"), // Provides default for null
+                new MethodMatcher("java.util.Optional ofNullable(..)"), // Handles nullable values
                 new MethodMatcher("org.apache.commons.lang3.StringUtils isBlank(..)"),
                 new MethodMatcher("org.apache.commons.lang3.StringUtils isEmpty(..)"),
                 new MethodMatcher("org.apache.commons.lang3.StringUtils isNotBlank(..)"),
@@ -208,6 +213,18 @@ public J.If visitIf(J.If iff, Set<J.Identifier> nullCheckedParams) {
             return iff;
         }
 
+        @Override
+        public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Set<J.Identifier> nullCheckedParams) {
+            // Handle standalone Objects.requireNonNull calls (not just in if conditions)
+            if (isKnownNullMethodChecker(method) && method.getArguments().get(0) instanceof J.Identifier) {
+                J.Identifier firstArgument = (J.Identifier) method.getArguments().get(0);
+                if (containsIdentifierByName(identifiers, firstArgument)) {
+                    nullCheckedParams.add(firstArgument);
+                }
+            }
+            return super.visitMethodInvocation(method, nullCheckedParams);
+        }
+
         private void handleCondition(Expression condition, Set<J.Identifier> nullCheckedParams) {
             if (condition instanceof J.Binary) {
                 handleBinary((J.Binary) condition, nullCheckedParams);

src/test/java/org/openrewrite/staticanalysis/AnnotateNullableParametersTest.java

@@ -378,6 +378,122 @@ boolean bar(Object obj) {
     @Nested
     class KnownNullCheckers {
 
+        @Test
+        void objectsRequireNonNullElse() {
+            rewriteRun(
+              //language=java
+              java(
+                """
+                  import java.util.Objects;
+
+                  class PersonBuilder {
+                      private String name;
+                      private String email;
+
+                      public PersonBuilder setName(String name) {
+                          this.name = Objects.requireNonNullElse(name, "Unknown");
+                          return this;
+                      }
+
+                      public PersonBuilder setNameWithFallback(String name, String fallback) {
+                          this.name = Objects.requireNonNullElse(name, fallback);
+                          return this;
+                      }
+
+                      public PersonBuilder setEmail(String email) {
+                          this.email = Objects.requireNonNullElseGet(email, () -> "[email protected]");
+                          return this;
+                      }
+                  }
+                  """,
+                """
+                  import org.jspecify.annotations.Nullable;
+
+                  import java.util.Objects;
+
+                  class PersonBuilder {
+                      private String name;
+                      private String email;
+
+                      public PersonBuilder setName(@Nullable String name) {
+                          this.name = Objects.requireNonNullElse(name, "Unknown");
+                          return this;
+                      }
+
+                      public PersonBuilder setNameWithFallback(@Nullable String name, String fallback) {
+                          this.name = Objects.requireNonNullElse(name, fallback);
+                          return this;
+                      }
+
+                      public PersonBuilder setEmail(@Nullable String email) {
+                          this.email = Objects.requireNonNullElseGet(email, () -> "[email protected]");
+                          return this;
+                      }
+                  }
+                  """
+              )
+            );
+        }
+
+        @Test
+        void optionalOfNullable() {
+            rewriteRun(
+              //language=java
+              java(
+                """
+                  import java.util.Optional;
+
+                  public class PersonService {
+
+                      public Optional<String> processValue(String value) {
+                          return Optional.ofNullable(value)
+                                  .filter(v -> !v.isEmpty())
+                                  .map(String::toUpperCase);
+                      }
+
+                      public Optional<String> wrapValue(String input) {
+                          // Direct usage of parameter in Optional.ofNullable
+                          return Optional.ofNullable(input);
+                      }
+
+                      public Optional<String> conditionalWrap(String data) {
+                          if (data != null && data.length() > 5) {
+                              return Optional.of(data);
+                          }
+                          return Optional.ofNullable(data);
+                      }
+                  }
+                  """,
+                """
+                  import org.jspecify.annotations.Nullable;
+
+                  import java.util.Optional;
+
+                  public class PersonService {
+
+                      public Optional<String> processValue(@Nullable String value) {
+                          return Optional.ofNullable(value)
+                                  .filter(v -> !v.isEmpty())
+                                  .map(String::toUpperCase);
+                      }
+
+                      public Optional<String> wrapValue(@Nullable String input) {
+                          // Direct usage of parameter in Optional.ofNullable
+                          return Optional.ofNullable(input);
+                      }
+
+                      public Optional<String> conditionalWrap(@Nullable String data) {
+                          if (data != null && data.length() > 5) {
+                              return Optional.of(data);
+                          }
+                          return Optional.ofNullable(data);
+                      }
+                  }
+                  """
+              )
+            );
+        }
+
         @CsvSource({
           "java.util.Objects, Objects.nonNull",
           "org.apache.commons.lang3.StringUtils, StringUtils.isNotBlank",