Merge pull request #206 from Ladicek/improve-annotation-string

improve AnnotationInstance.toString() when the annotation only has the "value" member
smallrye · May 25, 2022 · c9779b8 · c9779b8
2 parents 7fea727 + 497b8f2
commit c9779b8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/core/src/main/java/org/jboss/jandex/AnnotationInstance.java b/core/src/main/java/org/jboss/jandex/AnnotationInstance.java
@@ -336,7 +336,11 @@ public boolean runtimeVisible() {
     public String toString(boolean simple) {
         StringBuilder builder = new StringBuilder("@").append(simple ? name.local() : name);
 
-        if (values.length > 0) {
+        if (simple && values.length == 1 && values[0].name().equals("value")) {
+            builder.append("(");
+            builder.append(values[0].toString(false));
+            builder.append(')');
+        } else if (values.length > 0) {
             builder.append("(");
             for (int i = 0; i < values.length; i++) {
                 builder.append(values[i]);

diff --git a/core/src/main/java/org/jboss/jandex/AnnotationValue.java b/core/src/main/java/org/jboss/jandex/AnnotationValue.java
@@ -527,8 +527,12 @@ public AnnotationInstance[] asNestedArray() {
     }
 
     public String toString() {
+        return toString(true);
+    }
+
+    String toString(boolean includeName) {
         StringBuilder builder = new StringBuilder();
-        if (name.length() > 0)
+        if (includeName && name.length() > 0)
             builder.append(name).append(" = ");
         return builder.append(value()).toString();
     }
@@ -581,9 +585,9 @@ public Kind kind() {
             return Kind.STRING;
         }
 
-        public String toString() {
+        String toString(boolean includeName) {
             StringBuilder builder = new StringBuilder();
-            if (super.name.length() > 0)
+            if (includeName && super.name.length() > 0)
                 builder.append(super.name).append(" = ");
 
             return builder.append('"').append(value).append('"').toString();
@@ -1239,9 +1243,9 @@ AnnotationValue[] asArray() {
             return value;
         }
 
-        public String toString() {
+        String toString(boolean includeName) {
             StringBuilder builder = new StringBuilder();
-            if (super.name.length() > 0)
+            if (includeName && super.name.length() > 0)
                 builder.append(super.name).append(" = ");
             builder.append('[');
             for (int i = 0; i < value.length; i++) {