Commit 5166997
committed
Fix AOT critter model generation for entities incompatible with static analysis
Introduces pre-generation compatibility checks that skip AOT for entities
the ClassFile API can't handle from a non-<init> context:
- Final fields: putfield on final from injected methods throws IllegalAccessError
- Private inherited fields: child class can't reach parent's private field
- Array-typed fields: checkcast mismatch when Morphia passes Object[] at runtime
- No @id on any field: entity uses getter-based discovery; AOT FIELDS mode would
produce a model without @id, breaking tests that run with propertyDiscovery=METHODS
- @id on a getter (method path): same problem — entity must be discovered at runtime
Skipped entities fall through to Tier 2 (runtime nestmate generation) or
Tier 3 (reflection), which already handle all these cases correctly.
Also:
- Fix critterPackage() inner-class naming collision: use full relative class name
(replacing $ with _) so TestLazyIdOnly$ReferencedEntity and
TestLazyIdOnlyIgnoreMissing$ReferencedEntity no longer map to the same package
- Fix CritterMapper.tryLoadPregenerated() to catch Throwable so LinkageError /
IllegalAccessError from stale AOT classes falls back to runtime generation
- Clean __morphia dirs before regenerating to prevent stale model files1 parent 8e73a19 commit 5166997
5 files changed
Lines changed: 88 additions & 5 deletions
File tree
- core/src
- main/java/dev/morphia
- critter
- parser
- mapping
- test/java/dev/morphia/critter/parser/generator
- critter/critter-maven/src/main/kotlin/dev/morphia/critter/maven
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
28 | 34 | | |
29 | 35 | | |
30 | 36 | | |
| |||
Lines changed: 68 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| 72 | + | |
72 | 73 | | |
73 | 74 | | |
74 | 75 | | |
| |||
81 | 82 | | |
82 | 83 | | |
83 | 84 | | |
| 85 | + | |
84 | 86 | | |
85 | 87 | | |
86 | 88 | | |
| |||
95 | 97 | | |
96 | 98 | | |
97 | 99 | | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
98 | 163 | | |
99 | 164 | | |
100 | 165 | | |
| |||
141 | 206 | | |
142 | 207 | | |
143 | 208 | | |
144 | | - | |
| 209 | + | |
| 210 | + | |
145 | 211 | | |
146 | | - | |
| 212 | + | |
147 | 213 | | |
148 | 214 | | |
149 | 215 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
154 | 154 | | |
155 | 155 | | |
156 | 156 | | |
157 | | - | |
| 157 | + | |
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
| |||
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
44 | 49 | | |
45 | 50 | | |
46 | 51 | | |
| |||
Lines changed: 6 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
47 | 53 | | |
48 | 54 | | |
49 | 55 | | |
| |||
0 commit comments