ReplaceAnnotation replaces with wrong annotation in method with annotated argument and local variable

[timtebeek]

How are you running OpenRewrite?

Unit test based on https://github.com/openrewrite/rewrite/releases/tag/v8.33.7

What is the smallest, simplest way to reproduce the problem?

@Test
void methodWithAnnotatedParameter() {
    rewriteRun(
      spec -> spec.recipe(new ReplaceAnnotation("@org.jetbrains.annotations.NotNull", "@lombok.NonNull", null)),
      java(
        """
          import org.jetbrains.annotations.NotNull;
          import org.jetbrains.annotations.Nullable;
          class ValueAnnotationDuplication {
              void methodName(
                  @Nullable final boolean valueVar) {
                  @NotNull final String nullableVar = "test";
              }
          }
          """,
        """
          import lombok.NonNull;
          import org.jetbrains.annotations.Nullable;
          class ValueAnnotationDuplication {
              void methodName(
                  @Nullable final boolean valueVar) {
                  @NonNull final String nullableVar = "test";
              }
          }
          """
      )
    );
}

What did you expect to see?

Above unit test to pass

What did you see instead?

Incorrect replacement

diff --git a/ValueAnnotationDuplication.java b/ValueAnnotationDuplication.java
index 3b9317e..a586033 100644
--- a/ValueAnnotationDuplication.java
+++ b/ValueAnnotationDuplication.java
@@ -1,8 +1,7 @@ 
-import lombok.NonNull;
 import org.jetbrains.annotations.Nullable;
 class ValueAnnotationDuplication {
     void methodName(
         @Nullable final boolean valueVar) {
-        @NonNull final String nullableVar = "test";
+        @Nullable final String nullableVar = "test";
     }
 }
\ No newline at end of file

[timtebeek]

Looks to go wrong here because we have no parameters

rewrite/rewrite-java/src/main/java/org/openrewrite/java/internal/template/Substitutions.java

Lines 238 to 241 in a98d83d

	public <J2 extends J> J2 unsubstitute(J2 j) {
	if (parameters.length == 0) {
	return j;
	}

Both annotations from the parent scope are then returned; after which we replace the first.

rewrite/rewrite-java/src/main/java/org/openrewrite/java/internal/template/JavaTemplateJavaExtension.java

Lines 61 to 67 in 54f8209

	List<J.Annotation> gen = substitutions.unsubstitute(templateParser.parseAnnotations(getCursor(), substitutedTemplate));
	if (gen.isEmpty()) {
	throw new IllegalStateException("Unable to parse annotation from template: \n" +
	substitutedTemplate +
	"\nUse JavaTemplate.Builder.doBeforeParseTemplate() to see what stub is being generated and include it in any bug report.");
	}
	return gen.get(0).withPrefix(annotation.getPrefix());