Commit fd1f288
authored
fix: detect @PropertyTransformer on read-only derived properties [DHIS2-21872] (#24520)
* fix: detect @PropertyTransformer on read-only derived properties [DHIS2-21872]
PropertyPropertyIntrospector.updatePropertyTypes() only read the
@PropertyTransformer annotation inside the isWritable() branch. A
property whose getter is annotated but has no matching setter (e.g.
UserRole.getUsers(), computed from the separately-named `members`
field) is read-only, so its annotation was silently dropped and
Property.hasPropertyTransformer() returned false at runtime even
though the annotation is present in source.
Move the annotation read outside the writability gate, since whether
a property is serialized via a custom transformer is orthogonal to
whether it can be written to.
Found while live-validating DHIS2-21856/PR #24519: with that fix
alone, GET /api/userRoles/{id}?fields=users[*] against an
83,385-member role still took 139.7s / ~583k queries because
hasPropertyTransformer() never saw UserRole.users' annotation. With
this fix applied, the same request drops to 5.76s.
* fix: apply @Property annotation regardless of writability too [DHIS2-21872]
Per review feedback from @jbee: initFromPropertyAnnotation() was also
gated behind isWritable(), but most of @Property's attributes (type
override, required/persisted/owner flags, persistedAs aliasing)
describe the property itself and apply equally to read-only
properties or aliases, not just writable ones.
Snapshot writability before calling initFromPropertyAnnotation(),
since that call can itself flip it via access = READ_ONLY/WRITE_ONLY,
and range/min-max defaults should still be judged against the
pre-annotation writability (matches existing behavior for e.g.
Attribute.getObjectTypes(), which has a real setter overridden to
read-only via the annotation).
Added regression coverage: a read-only property now picks up
persistedAs() (previously silently ignored), and a writable property
whose annotation overrides it to read-only still gets range/min-max
defaults applied (unchanged behavior).1 parent 0cea25c commit fd1f288
2 files changed
Lines changed: 144 additions & 3 deletions
File tree
- dhis-2/dhis-services/dhis-service-schema/src
- main/java/org/hisp/dhis/schema/introspection
- test/java/org/hisp/dhis/schema/introspection
Lines changed: 17 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
92 | | - | |
93 | | - | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
94 | 102 | | |
95 | 103 | | |
96 | 104 | | |
97 | 105 | | |
98 | 106 | | |
99 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
100 | 114 | | |
101 | 115 | | |
102 | 116 | | |
| |||
Lines changed: 127 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 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 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
0 commit comments