Commit eef4366
committed
fix: Preserve integral Number type in toJsonTree for byte/short/int
The BYTE, SHORT, and INTEGER type adapters' write methods called
value(byteValue()), value(shortValue()), and value(intValue())
respectively. Since JsonWriter only has value(long), Java auto-widened
the primitive to long, causing JsonTreeWriter.value(long) to store a
Long in the JsonPrimitive instead of the original Byte/Short/Integer.
Fix by casting the narrowed primitive to Number, which triggers
autoboxing to the correct type and resolves to value(Number) instead
of value(long).
Fixes #26801 parent 1fa9b7a commit eef4366
2 files changed
Lines changed: 30 additions & 3 deletions
File tree
- gson/src
- main/java/com/google/gson/internal/bind
- test/java/com/google/gson/functional
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
214 | 214 | | |
215 | 215 | | |
216 | 216 | | |
217 | | - | |
| 217 | + | |
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
| |||
249 | 249 | | |
250 | 250 | | |
251 | 251 | | |
252 | | - | |
| 252 | + | |
253 | 253 | | |
254 | 254 | | |
255 | 255 | | |
| |||
277 | 277 | | |
278 | 278 | | |
279 | 279 | | |
280 | | - | |
| 280 | + | |
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
| |||
Lines changed: 27 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
161 | 161 | | |
162 | 162 | | |
163 | 163 | | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
164 | 191 | | |
165 | 192 | | |
166 | 193 | | |
| |||
0 commit comments