Commit 8ed56f0
Fix Map.Entry deserialization for property-level NATURAL override (#5867)
Follow-up to #1419 / #5397.
POJOWrappedDeserializer.createContextual() still used a POJO-wrapped
deserializer when property-level @jsonformat(shape = NATURAL) should
reverse a global POJO format override.
Use constructDefault() instead so deserialization honors the more specific
property override, and add a regression test for that case.1 parent 60d2afa commit 8ed56f0
2 files changed
Lines changed: 17 additions & 1 deletion
File tree
- src
- main/java/tools/jackson/databind/deser/jdk
- test/java/tools/jackson/databind/format
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
405 | 405 | | |
406 | 406 | | |
407 | 407 | | |
408 | | - | |
| 408 | + | |
409 | 409 | | |
410 | 410 | | |
411 | 411 | | |
| |||
Lines changed: 16 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
231 | 231 | | |
232 | 232 | | |
233 | 233 | | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
234 | 250 | | |
235 | 251 | | |
236 | 252 | | |
| |||
0 commit comments