Commit 99b38d7
committed
Record Javadoc reference packages in
`TypesInUse` deliberately excludes fully qualified Javadoc references from
its import-retention set (#5738), since such references need no import.
`ChangePackage` therefore carried its own LST walk to rediscover exactly
those references for its precondition — duplicating the "is this a fully
qualified Javadoc reference" predicate, which is how the regression fixed
in #7284 originally crept in.
Capture the packages of those references in a separate transient
`javadocPackages` bucket during the single `FindTypesInUse` walk, and have
`ChangePackage` query it via `hasJavadocReferenceInPackage`. Only the
package is retained, since that is all package-renaming recipes ask. The
import-retention set is unchanged, so `RemoveUnusedImports`/`UsesType`/the
FQN trie behave exactly as before. The bucket is not serialized;
`TypesInUse.of` leaves it empty.TypesInUse
1 parent a4b817d commit 99b38d7
3 files changed
Lines changed: 83 additions & 53 deletions
File tree
- rewrite-java-test/src/test/java/org/openrewrite/java/internal
- rewrite-java/src/main/java/org/openrewrite/java
- internal
Lines changed: 38 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
68 | 106 | | |
69 | 107 | | |
70 | 108 | | |
| |||
Lines changed: 3 additions & 48 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
| |||
109 | 108 | | |
110 | 109 | | |
111 | 110 | | |
112 | | - | |
113 | | - | |
114 | | - | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
115 | 114 | | |
116 | 115 | | |
117 | 116 | | |
| |||
537 | 536 | | |
538 | 537 | | |
539 | 538 | | |
540 | | - | |
541 | | - | |
542 | | - | |
543 | | - | |
544 | | - | |
545 | | - | |
546 | | - | |
547 | | - | |
548 | | - | |
549 | | - | |
550 | | - | |
551 | | - | |
552 | | - | |
553 | | - | |
554 | | - | |
555 | | - | |
556 | | - | |
557 | | - | |
558 | | - | |
559 | | - | |
560 | | - | |
561 | | - | |
562 | | - | |
563 | | - | |
564 | | - | |
565 | | - | |
566 | | - | |
567 | | - | |
568 | | - | |
569 | | - | |
570 | | - | |
571 | | - | |
572 | | - | |
573 | | - | |
574 | | - | |
575 | | - | |
576 | | - | |
577 | | - | |
578 | | - | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
583 | | - | |
584 | 539 | | |
585 | 540 | | |
586 | 541 | | |
| |||
Lines changed: 42 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| |||
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
52 | 66 | | |
53 | 67 | | |
54 | 68 | | |
| |||
83 | 97 | | |
84 | 98 | | |
85 | 99 | | |
86 | | - | |
| 100 | + | |
| 101 | + | |
87 | 102 | | |
88 | 103 | | |
89 | 104 | | |
| |||
96 | 111 | | |
97 | 112 | | |
98 | 113 | | |
99 | | - | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
100 | 131 | | |
101 | 132 | | |
102 | 133 | | |
| |||
509 | 540 | | |
510 | 541 | | |
511 | 542 | | |
| 543 | + | |
512 | 544 | | |
513 | 545 | | |
514 | 546 | | |
| |||
554 | 586 | | |
555 | 587 | | |
556 | 588 | | |
557 | | - | |
558 | | - | |
559 | | - | |
| 589 | + | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
| 595 | + | |
| 596 | + | |
560 | 597 | | |
561 | 598 | | |
562 | 599 | | |
| |||
0 commit comments