@@ -454,9 +454,9 @@ public Void visitNewArray(NewArrayTree node, Void unused) {
454454
455455 Deque <ExpressionTree > dimExpressions = new ArrayDeque <>(node .getDimensions ());
456456
457- Deque <List <AnnotationTree >> annotations = new ArrayDeque <>();
457+ Deque <List <? extends AnnotationTree >> annotations = new ArrayDeque <>();
458458 annotations .add (ImmutableList .copyOf (node .getAnnotations ()));
459- annotations .addAll (( List < List < AnnotationTree >>) node .getDimAnnotations ());
459+ annotations .addAll (node .getDimAnnotations ());
460460 annotations .addAll (extractedDims .dims );
461461
462462 scan (base , null );
@@ -578,7 +578,7 @@ private void visitAnnotatedArrayType(Tree node) {
578578 TypeWithDims extractedDims = DimensionHelpers .extractDims (node , SortedDims .YES );
579579 builder .open (plusFour );
580580 scan (extractedDims .node , null );
581- Deque <List <AnnotationTree >> dims = new ArrayDeque <>(extractedDims .dims );
581+ Deque <List <? extends AnnotationTree >> dims = new ArrayDeque <>(extractedDims .dims );
582582 maybeAddDims (dims );
583583 Verify .verify (dims .isEmpty ());
584584 builder .close ();
@@ -1352,7 +1352,7 @@ public Void visitMethod(MethodTree node, Void unused) {
13521352 annotations , Direction .VERTICAL , /* declarationAnnotationBreak= */ Optional .empty ()));
13531353
13541354 Tree baseReturnType = null ;
1355- Deque <List <AnnotationTree >> dims = null ;
1355+ Deque <List <? extends AnnotationTree >> dims = null ;
13561356 if (node .getReturnType () != null ) {
13571357 TypeWithDims extractedDims =
13581358 DimensionHelpers .extractDims (node .getReturnType (), SortedDims .YES );
@@ -3234,7 +3234,7 @@ int declareOne(
32343234 builder .blankLineWanted (BlankLineWanted .conditional (verticalAnnotationBreak ));
32353235 }
32363236
3237- Deque <List <AnnotationTree >> dims =
3237+ Deque <List <? extends AnnotationTree >> dims =
32383238 new ArrayDeque <>(
32393239 typeWithDims .isPresent () ? typeWithDims .get ().dims : Collections .emptyList ());
32403240 int baseDims = 0 ;
@@ -3321,7 +3321,7 @@ int declareOne(
33213321 return baseDims ;
33223322 }
33233323
3324- private void maybeAddDims (Deque <List <AnnotationTree >> annotations ) {
3324+ private void maybeAddDims (Deque <List <? extends AnnotationTree >> annotations ) {
33253325 maybeAddDims (new ArrayDeque <>(), annotations );
33263326 }
33273327
@@ -3338,15 +3338,15 @@ private void maybeAddDims(Deque<List<AnnotationTree>> annotations) {
33383338 * [[@A, @B], [@C]]} for {@code int @A [] @B @C []}
33393339 */
33403340 private void maybeAddDims (
3341- Deque <ExpressionTree > dimExpressions , Deque <List <AnnotationTree >> annotations ) {
3341+ Deque <ExpressionTree > dimExpressions , Deque <List <? extends AnnotationTree >> annotations ) {
33423342 boolean lastWasAnnotation = false ;
33433343 while (builder .peekToken ().isPresent ()) {
33443344 switch (builder .peekToken ().get ()) {
33453345 case "@" :
33463346 if (annotations .isEmpty ()) {
33473347 return ;
33483348 }
3349- List <AnnotationTree > dimAnnotations = annotations .removeFirst ();
3349+ List <? extends AnnotationTree > dimAnnotations = annotations .removeFirst ();
33503350 if (dimAnnotations .isEmpty ()) {
33513351 continue ;
33523352 }
@@ -3396,7 +3396,7 @@ private void declareMany(List<VariableTree> fragments, Direction annotationDirec
33963396 builder .open (plusFour );
33973397 builder .open (ZERO );
33983398 TypeWithDims extractedDims = DimensionHelpers .extractDims (type , SortedDims .YES );
3399- Deque <List <AnnotationTree >> dims = new ArrayDeque <>(extractedDims .dims );
3399+ Deque <List <? extends AnnotationTree >> dims = new ArrayDeque <>(extractedDims .dims );
34003400 scan (extractedDims .node , null );
34013401 int baseDims = dims .size ();
34023402 maybeAddDims (dims );
0 commit comments