Merge branch '2.17' into 2.18

FasterXML · Apr 6, 2024 · e6145c3 · e6145c3
2 parents a29f346 + 7c9e7c1
commit e6145c3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -20,6 +20,8 @@ Project: jackson-databind
   String ".05": not a valid representation
  (reported by @EAlf91)
  (fix by @pjfanning)
+#4450: Empty QName deserialized as `null`
+ (reported by @winfriedgerlach)
 
 2.17.0 (12-Mar-2024)
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java
@@ -256,7 +256,7 @@ protected Object _deserializeFromEmptyString(DeserializationContext ctxt) throws
         if (act == CoercionAction.AsEmpty) {
             return getEmptyValue(ctxt);
         }
-        // 09-Jun-2020, tatu: semantics for `TryConvert` are bit interesting due to
+        // 09-Jun-2020, tatu: semantics for `TryConvert` are a bit interesting due to
         //    historical reasons
         return _deserializeFromEmptyStringDefault(ctxt);
     }

diff --git a/src/main/java/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.java b/src/main/java/com/fasterxml/jackson/databind/ext/CoreXMLDeserializers.java
@@ -19,9 +19,11 @@
  */
 public class CoreXMLDeserializers extends Deserializers.Base
 {
+    protected final static QName EMPTY_QNAME = QName.valueOf("");
+
     /**
      * Data type factories are thread-safe after instantiation (and
-     * configuration, if any); and since instantion (esp. implementation
+     * configuration, if any); and since instantiation (esp. implementation
      * introspection) can be expensive we better reuse the instance.
      */
     final static DatatypeFactory _dataTypeFactory;
@@ -125,6 +127,14 @@ protected Object _deserialize(String value, DeserializationContext ctxt)
             throw new IllegalStateException();
         }
 
+        @Override
+        protected Object _deserializeFromEmptyString(DeserializationContext ctxt) throws IOException {
+            if (_kind == TYPE_QNAME) {
+                return EMPTY_QNAME;
+            }
+            return super._deserializeFromEmptyString(ctxt);
+        }
+
         protected XMLGregorianCalendar _gregorianFromDate(DeserializationContext ctxt,
                 Date d)
         {

diff --git a/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java b/src/test/java/com/fasterxml/jackson/databind/ext/MiscJavaXMLTypesReadWriteTest.java
@@ -115,6 +115,11 @@ public void testQNameDeser() throws Exception
         String qstr = qn.toString();
         assertEquals(qn, MAPPER.readValue(q(qstr), QName.class),
             "Should deserialize to equal QName (exp serialization: '"+qstr+"')");
+
+        // [databind#4450]
+        qn = MAPPER.readValue(q(""), QName.class);
+        assertNotNull(qn);
+        assertEquals("", qn.getLocalPart());
     }
 
     @Test