"value" attr when adding another attribute (#5962)

* "value" attr when adding another attribute

* Apply suggestion

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: Tim te Beek <timtebeek@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim te Beek <tim@moderne.io>

Author: 3 people

rewrite-java-test/src/test/java/org/openrewrite/java/AddOrUpdateAnnotationAttributeTest.java

@@ -2335,36 +2335,29 @@ void attributeWithShallowType() {
             "required",
             "true",
             null,
-            false,
+            true,
             false)
           ),
           java(
             """
               package org.example;
               public @interface Bar {
-              }
-              """
-          ),
-          java(
-            """
-              package org.example;
-              public @interface Foo {
-                  boolean required();
+                String value() default "";
               }
               """
           ),
           java(
             """
               import org.example.Bar;
 
-              @Bar
+              @Bar("q")
               public class A {
               }
               """,
             """
               import org.example.Foo;
 
-              @Foo(required = true)
+              @Foo(required = true, value = "q")
               public class A {
               }
               """

rewrite-java/src/main/java/org/openrewrite/java/AddOrUpdateAnnotationAttribute.java

@@ -144,7 +144,12 @@ public J.Annotation visitAnnotation(J.Annotation original, ExecutionContext ctx)
                 // ADD the value into the argument list when there was no existing value to update and no requirements on a pre-existing old value, e.g. @Foo(name="old") to @Foo(value="new", name="old")
                 if (oldAttributeValue == null && newAttributeValue != null && !attributeNameOrValIsAlreadyPresent(a.getArguments(), getAttributeValues())) {
                     J.Assignment as = createAnnotationAssignment(a, attributeName(), newAttributeValue);
-                    a = a.withArguments(ListUtils.concat(as, a.getArguments()));
+                    List<Expression> args = a.getArguments();
+                    // Case for existing attribute: `@Foo("q")` -> @Foo(value = "q")
+                    if (args.size() == 1 && !(args.get(0) instanceof J.Assignment)) {
+                        args = singletonList(createAnnotationAssignment(a, "value", a.getArguments().get(0)));
+                    }
+                    a = a.withArguments(ListUtils.concat(as, args));
                 }
 
                 if (original != a) {