Skip to content

Commit c1e24e0

Browse files
committed
Fix Parser.parseAnnotationDesc to correctly get the value
when an annotation argument is not an array (needing no iteration to get such a value and add the annotationArgumentNode.getValue() list). Signed-off-by: Manoel Campos <manoelcampos@gmail.com>
1 parent ff883b9 commit c1e24e0

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/main/java/com/github/markusbernhardt/xmldoclet/Parser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ This attribute is a List (even if there is a single value).
233233
annotationArgumentNode.getValue().add(((AnnotationValue)value).getValue().toString());
234234
}
235235
}
236-
}
236+
} else annotationArgumentNode.getValue().add(annotationValue.getValue().toString());
237237
}
238238
case null -> {}
239239
default -> annotationArgumentNode.getValue().add(objValue.toString());

src/test/java/com/github/markusbernhardt/xmldoclet/ClassTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ void testClass17() {
755755
assertEquals(2, argument.getValue().size());
756756
assertEquals("1", argument.getValue().get(0));
757757
assertEquals("2", argument.getValue().get(1));
758-
assertTrue(argument.isPrimitive());
758+
assertFalse(argument.isPrimitive());
759759
assertTrue(argument.isArray());
760760
}
761761

@@ -821,8 +821,7 @@ void testClass21() {
821821

822822
assertEquals("char", argument.getType().getQualified());
823823
assertEquals(1, argument.getValue().size());
824-
final int ascii = 'a';
825-
assertEquals(Integer.toString(ascii), argument.getValue().getFirst());
824+
assertEquals("a", argument.getValue().getFirst());
826825
assertTrue(argument.isPrimitive());
827826
assertFalse(argument.isArray());
828827
}
@@ -839,7 +838,7 @@ void testClass22() {
839838

840839
assertEquals("char", argument.getType().getQualified());
841840
assertEquals(1, argument.getValue().size());
842-
assertEquals("0", argument.getValue().getFirst());
841+
assertEquals("\u0000", argument.getValue().getFirst());
843842
assertTrue(argument.isPrimitive());
844843
assertFalse(argument.isArray());
845844
}
@@ -873,7 +872,7 @@ void testClass24() {
873872

874873
assertEquals("int[]", argument.getType().getQualified());
875874
assertTrue(argument.getValue().isEmpty());
876-
assertTrue(argument.isPrimitive());
875+
assertFalse(argument.isPrimitive());
877876
assertTrue(argument.isArray());
878877
}
879878
}

0 commit comments

Comments
 (0)