Fix #608: support text-node-only cases (#826)

Author: cowtowncoder

release-notes/VERSION

@@ -62,6 +62,9 @@ Version: 3.x (for earlier see VERSION-2.x)
   deserialization to base class
  (reported by @tetradon)
  (fix by @cowtowncoder, w/ Claude code)
+#608: Jackson fails to instantiate class when only text node is present
+ (reported by @codemonstur)
+ (fix by @cowtowncoder, w/ Claude code)
 #615: Deserialization of Xml with `@JacksonXmlText` using `@JsonCreator` (into
   `java.util.Map`) fails
  (reported by Severin K)

src/main/java/tools/jackson/dataformat/xml/deser/XmlBeanDeserializerModifier.java

@@ -113,8 +113,11 @@ protected ValueDeserializer<?> _modifyBeanDeserializer(DeserializationConfig con
         //    coercion.
         // 30-Apr-2020, tatu: Complication from [dataformat-xml#318] as we now
         //    have a delegate too...
+        // [dataformat-xml#608]: relaxed from earlier check that required all
+        // non-text properties to be attributes; now handles beans with
+        // @JacksonXmlText alongside other element properties too.
         if (!inst.canCreateFromString()) {
-            SettableBeanProperty textProp = _findSoleTextProp(config, deser.properties());
+            SettableBeanProperty textProp = _findTextProp(deser.properties());
             if (textProp != null) {
                 return new XmlTextDeserializer(deser, textProp);
             }
@@ -142,31 +145,22 @@ protected ValueDeserializer<?> _modifyThroughDelegation(DeserializationConfig co
         return deser;
     }
 
-    private SettableBeanProperty _findSoleTextProp(DeserializationConfig config,
-            Iterator<SettableBeanProperty> propIt)
+    /**
+     * Find the {@code @JacksonXmlText} property (renamed to {@code _cfgNameForTextValue}
+     * by {@link #updateProperties}) if one exists.
+     *<p>
+     * NOTE: before [dataformat-xml#608] fix, this method also required all non-text
+     * properties to be attributes; relaxed to allow element properties too.
+     */
+    private SettableBeanProperty _findTextProp(Iterator<SettableBeanProperty> propIt)
     {
-        final AnnotationIntrospector ai = config.getAnnotationIntrospector();
-        SettableBeanProperty textProp = null;
         while (propIt.hasNext()) {
             SettableBeanProperty prop = propIt.next();
-            AnnotatedMember m = prop.getMember();
-            if (m != null) {
-                // Ok, let's use a simple check: we should have renamed it earlier so:
-                PropertyName n = prop.getFullName();
-                if (_cfgNameForTextValue.equals(n.getSimpleName())) {
-                    // should we verify we only got one?
-                    textProp = prop;
-                    continue;
-                }
-                // as-attribute are ok as well
-                Boolean b = AnnotationUtil.findIsAttributeAnnotation(config, ai, m);
-                if (b != null && b.booleanValue()) {
-                    continue;
-                }
+            PropertyName n = prop.getFullName();
+            if (_cfgNameForTextValue.equals(n.getSimpleName())) {
+                return prop;
             }
-            // Otherwise, it's something else; no go
-            return null;
         }
-        return textProp;
+        return null;
     }
 }

…t/xml/tofix/XmlTextOnlyDeser608Test.java …t/xml/deser/XmlTextOnlyDeser608Test.javasrc/test/java/tools/jackson/dataformat/xml/tofix/XmlTextOnlyDeser608Test.java renamed to src/test/java/tools/jackson/dataformat/xml/deser/XmlTextOnlyDeser608Test.java src/test/java/tools/jackson/dataformat/xml/tofix/XmlTextOnlyDeser608Test.java renamed to src/test/java/tools/jackson/dataformat/xml/deser/XmlTextOnlyDeser608Test.java

@@ -1,12 +1,11 @@
-package tools.jackson.dataformat.xml.tofix;
+package tools.jackson.dataformat.xml.deser;
 
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.dataformat.xml.XmlTestUtil;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import tools.jackson.dataformat.xml.annotation.JacksonXmlText;
-import tools.jackson.dataformat.xml.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -39,6 +38,18 @@ static class Plain608 {
         public String text;
     }
 
+    // Has @JacksonXmlText with mix of attributes and element properties
+    static class Mixed608 {
+        @JacksonXmlProperty(isAttribute = true)
+        public String attr;
+
+        @JacksonXmlProperty(isAttribute = false)
+        public String elem;
+
+        @JacksonXmlText
+        public String text;
+    }
+
     private final ObjectMapper MAPPER = newMapper();
 
     // Works: nested has both a child element and text content
@@ -62,10 +73,8 @@ public void testPlainTextOnly608() throws Exception {
         assertEquals("The text node.", result.plain.text);
     }
 
-    // Fails: nested type has @JacksonXmlText plus other element properties,
-    // but XML only contains text (no child elements). Jackson incorrectly
-    // tries String-argument constructor instead of object deserialization.
-    @JacksonTestFailureExpected
+    // [dataformat-xml#608]: nested type has @JacksonXmlText plus other element
+    // properties, but XML only contains text (no child elements).
     @Test
     public void testNestedWithOnlyText608() throws Exception {
         String xml = "<Root608><nested>The text node.</nested></Root608>";
@@ -75,4 +84,26 @@ public void testNestedWithOnlyText608() throws Exception {
         assertNull(result.nested.reallyNotHere);
         assertEquals("The text node.", result.nested.text);
     }
+
+    // [dataformat-xml#608]: mixed attributes + elements + text, text-only XML
+    @Test
+    public void testMixedTextOnly608() throws Exception {
+        String xml = "<Mixed608>The text node.</Mixed608>";
+        Mixed608 result = MAPPER.readValue(xml, Mixed608.class);
+        assertNotNull(result);
+        assertNull(result.attr);
+        assertNull(result.elem);
+        assertEquals("The text node.", result.text);
+    }
+
+    // [dataformat-xml#608]: mixed attributes + elements + text, with attribute present
+    @Test
+    public void testMixedWithAttrAndText608() throws Exception {
+        String xml = "<Mixed608 attr=\"v\">The text node.</Mixed608>";
+        Mixed608 result = MAPPER.readValue(xml, Mixed608.class);
+        assertNotNull(result);
+        assertEquals("v", result.attr);
+        assertNull(result.elem);
+        assertEquals("The text node.", result.text);
+    }
 }