fix: JavaBeanSerializeUtil handles null key in Map serialization - #16435
fix: JavaBeanSerializeUtil handles null key in Map serialization#16435waterWang wants to merge 2 commits into
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 3.3 #16435 +/- ##
============================================
- Coverage 36.93% 36.90% -0.03%
+ Complexity 11752 11744 -8
============================================
Files 1952 1952
Lines 89249 89250 +1
Branches 13389 13389
============================================
- Hits 32961 32940 -21
- Misses 51710 51724 +14
- Partials 4578 4586 +8
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
LI123456mo
left a comment
There was a problem hiding this comment.
Hi @waterWang , Nice fix . I've gone through the both issue and PR ; confirmed the deserialize round-trip path doesn't hit this (it iterates properties directly via iterator(), bypassing getProperty/containsProperty). But since JavaBeanDescriptor is a public class, wouldn't calling getProperty(null) or containsProperty(null) directly on a map-type descriptor still throw, given they don't have the same isMapType() exemption? Worth applying the same exemption there for API consistency, even if nothing internal currently exercises that path.
What is the purpose of the change
Fixes #16432:
JavaBeanSerializeUtil.serialize()throwsIllegalArgumentException("Property name is null")when serializing aMapthat contains anullkey.HashMappermits exactly onenullkey, so this is a legal input. The Map branch inserializeInternalexplicitly handles null keys (key == null ? null : createDescriptorIfAbsent(...)), but the descriptor produced is then rejected by thenotNullcheck inJavaBeanDescriptor.setProperty().Root cause
In
JavaBeanSerializeUtil.serializeInternal()Map branch:When the map has a null key,
keyDescriptorisnull, andJavaBeanDescriptor.setProperty(null, value)throws because of thenotNull(propertyName, "Property name is null")guard.Fix
Relax the
notNullguard inJavaBeanDescriptor.setProperty()for map-type descriptors only — anullkey is a legal Map key andLinkedHashMap(the backing storage) supports it. Bean/array/collection/class/enum descriptors keep the original null check.Verification
testSerialize_MapWithNullKey(round-trip test: map with a null key serializes, deserializes, and preserves both key-value pairs)JavaBeanSerializeUtilTestsuite unaffectedChecklist
3.3branch