change default property name for xml text from empty string to <xml:text>

duoduobingbing · duoduobingbing · commit f2224b5cd4a2 · 2025-04-27T17:10:42.000+02:00
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlAnnotationIntrospector.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlAnnotationIntrospector.java
@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
 import com.fasterxml.jackson.dataformat.xml.annotation.*;
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 
 /**
  * Extension of {@link JacksonAnnotationIntrospector} that is needed to support
@@ -213,6 +214,10 @@ public PropertyName findNameForDeserialization(Annotated a)
         PropertyName pn = PropertyName.merge(_findXmlName(a),
                 super.findNameForDeserialization(a));
         if (pn == null) {
+            if(_hasAnnotation(a, JacksonXmlText.class)) {
+                return PropertyName.construct(XmlTextPropertyNameHolder.PROPERTY_NAME);
+            }
+
             if (_hasOneOf(a, ANNOTATIONS_TO_INFER_XML_PROP)) {
                 return PropertyName.USE_DEFAULT;
             }
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlModule.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.databind.ser.SerializerFactory;
 import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser;
 import com.fasterxml.jackson.dataformat.xml.deser.XmlBeanDeserializerModifier;
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 import com.fasterxml.jackson.dataformat.xml.ser.XmlBeanSerializerModifier;
 
 /**
@@ -44,7 +45,7 @@ public class JacksonXmlModule
      * 
      * @since 2.1
      */
-    protected String _cfgNameForTextElement = FromXmlParser.DEFAULT_UNNAMED_TEXT_PROPERTY;
+    protected String _cfgNameForTextElement = XmlTextPropertyNameHolder.PROPERTY_NAME;
 
     /**
      * Optional override for {@link SerializerFactory}
@@ -78,7 +79,7 @@ public void setupModule(SetupContext context)
         context.insertAnnotationIntrospector(_constructIntrospector());
 
         // and finally inform XmlFactory about overrides, if need be:
-        if (_cfgNameForTextElement != FromXmlParser.DEFAULT_UNNAMED_TEXT_PROPERTY) {
+        if (_cfgNameForTextElement != FromXmlParser.DEFAULT_TEXT_PROPERTY) {
             XmlMapper m = (XmlMapper) context.getOwner();
             m.setXMLTextElementName(_cfgNameForTextElement);
         }
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java
@@ -35,10 +35,10 @@ public class FromXmlParser
     implements ElementWrappable // @since 2.15
 {
     /**
-     * The default name placeholder for XML text segments is empty
-     * String ("").
+     * The default name placeholder for XML text segments is "&lt;xml&gt;text"
+     * @since 2.20 Was empty text before 2.20
      */
-    public final static String DEFAULT_UNNAMED_TEXT_PROPERTY = "";
+    public final static String DEFAULT_TEXT_PROPERTY = XmlTextPropertyNameHolder.PROPERTY_NAME;
 
     /**
      * XML format has some peculiarities, indicated via new (2.12) capability
@@ -160,7 +160,7 @@ private Feature(boolean defaultState) {
      * 
      * @since 2.1
      */
-    protected String _cfgNameForTextElement = DEFAULT_UNNAMED_TEXT_PROPERTY;
+    protected String _cfgNameForTextElement = XmlTextPropertyNameHolder.PROPERTY_NAME;
 
     /*
     /**********************************************************
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlDeserializationContext.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlDeserializationContext.java
@@ -126,7 +126,7 @@ public String extractScalarFromObject(JsonParser p, JsonDeserializer<?> deser,
             final String propName = p.currentName();
             JsonToken t = p.nextToken();
             if (t == JsonToken.VALUE_STRING) {
-                if (propName.equals("")) {
+                if (propName.equals(XmlTextPropertyNameHolder.PROPERTY_NAME)) {
                     text = p.getText();
                 }
             } else {
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlTextPropertyNameHolder.java b/src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlTextPropertyNameHolder.java
@@ -0,0 +1,6 @@
+package com.fasterxml.jackson.dataformat.xml.deser;
+
+public class XmlTextPropertyNameHolder {
+
+    public static final String PROPERTY_NAME = "<xml:text>";
+}
diff --git a/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser734Test.java b/src/test-jdk17/java/com/fasterxml/jackson/dataformat/xml/records/failing/XmlRecordDeser734Test.java
@@ -18,7 +18,6 @@ record Amount(@JacksonXmlText String value,
     private final String XML =
             a2q("<Amt Ccy='EUR'>1</Amt>");
 
-    @JacksonTestFailureExpected
     @Test
     public void testDeser() throws Exception {
         XmlMapper mapper = new XmlMapper();
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/MapDeserializationTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/MapDeserializationTest.java
@@ -41,7 +41,7 @@ public void testMapWithAttr() throws Exception
          assertEquals(1, map.size());
          Map<String,Object> inner = new LinkedHashMap<>();
          inner.put("lang", "en");
-         inner.put("", "John Smith");
+         inner.put(XmlTextPropertyNameHolder.PROPERTY_NAME, "John Smith");
          assertEquals(Collections.singletonMap("person", inner), map);
     }
 }
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/UntypedObjectDeserTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/deser/UntypedObjectDeserTest.java
@@ -76,7 +76,7 @@ public void testMixedContent() throws Exception
         final String XML = "<root>first<a>123</a>second<b>abc</b>last</root>";
         final JsonNode fromXml = XML_MAPPER.valueToTree(XML_MAPPER.readValue(XML, Object.class));
         final ObjectNode exp = XML_MAPPER.createObjectNode();
-        exp.putArray("")
+        exp.putArray(XmlTextPropertyNameHolder.PROPERTY_NAME)
             .add("first")
             .add("second")
             .add("last");
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/node/JsonNodeBasicDeserTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/node/JsonNodeBasicDeserTest.java
@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml.node;
 
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.*;
@@ -43,7 +44,7 @@ public void testMixedContent() throws Exception
     {
         JsonNode fromXml = XML_MAPPER.readTree("<root>first<a>123</a>second<b>abc</b>last</root>");
         final ObjectNode exp = XML_MAPPER.createObjectNode();
-        exp.putArray("")
+        exp.putArray(XmlTextPropertyNameHolder.PROPERTY_NAME)
             .add("first")
             .add("second")
             .add("last");
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/node/JsonNodeMixedContent403Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/node/JsonNodeMixedContent403Test.java
@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml.node;
 
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -19,23 +20,23 @@ public class JsonNodeMixedContent403Test extends XmlTestUtil
     public void testMixedContentBefore() throws Exception
     {
         // First, before elements:
-        assertEquals(JSON_MAPPER.readTree(a2q("{'':'before','a':'1','b':'2'}")),
+        assertEquals(JSON_MAPPER.readTree(a2q("{'%s':'before','a':'1','b':'2'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),
                 XML_MAPPER.readTree("<root>before<a>1</a><b>2</b></root>"));
     }
 
     @Test
     public void testMixedContentBetween() throws Exception
     {
         // Second, between
-        assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','':'between','b':'2'}")),
+        assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','%s':'between','b':'2'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),
                 XML_MAPPER.readTree("<root><a>1</a>between<b>2</b></root>"));
     }
 
     @Test
     public void testMixedContentAfter() throws Exception
     {
         // and then after
-        assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','b':'2','':'after'}")),
+        assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','b':'2','%s':'after'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),
                 XML_MAPPER.readTree("<root><a>1</a><b>2</b>after</root>"));
     }
 
@@ -44,7 +45,7 @@ public void testMultipleMixedContent() throws Exception
     {
         // and then after
         assertEquals(JSON_MAPPER.readTree(
-                a2q("{'':['first','second','third'],'a':'1','b':'2'}")),
+                a2q("{'%s':['first','second','third'],'a':'1','b':'2'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),
                 XML_MAPPER.readTree("<root>first<a>1</a>second<b>2</b>third</root>"));
     }
 
@@ -57,7 +58,7 @@ public void testMixed226() throws Exception
                 +" mixed2</a>\n"
                 +"</root>";
         JsonNode fromJson = JSON_MAPPER.readTree(
-                a2q("{'a':{'':['mixed1 ',' mixed2'],'b':'leaf'}}"));
+                a2q("{'a':{'%s':['mixed1 ',' mixed2'],'b':'leaf'}}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME)));
         assertEquals(fromJson, XML_MAPPER.readTree(XML));
     }
 }
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/TestSerializationWithFilter.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/ser/TestSerializationWithFilter.java
@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml.ser;
 
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonFilter;
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlParser442Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlParser442Test.java
@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.dataformat.xml.stream;
 
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.JsonToken;
@@ -43,7 +44,7 @@ public void testMixedContentBeforeElement442() throws Exception
             // Here's what we are missing:
             assertToken(JsonToken.START_OBJECT, xp.nextToken());
             assertToken(JsonToken.FIELD_NAME, xp.nextToken());
-            assertEquals("", xp.currentName());
+            assertEquals(XmlTextPropertyNameHolder.PROPERTY_NAME, xp.currentName());
 
             assertToken(JsonToken.VALUE_STRING, xp.nextToken());
             assertEquals("text", xp.getText().trim());
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlParserTest.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/stream/XmlParserTest.java
@@ -2,6 +2,7 @@
 
 import java.io.*;
 
+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.core.*;
@@ -99,7 +100,7 @@ public void testRootScalar() throws Exception
         try (JsonParser p = _xmlMapper.createParser(XML)) {
             assertToken(JsonToken.START_OBJECT, p.nextToken());
             assertToken(JsonToken.FIELD_NAME, p.nextToken());
-            assertEquals("", p.currentName());
+            assertEquals(XmlTextPropertyNameHolder.PROPERTY_NAME, p.currentName());
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             assertEquals("value", p.getText());
             assertToken(JsonToken.END_OBJECT, p.nextToken());
@@ -118,7 +119,7 @@ public void testRootMixed() throws Exception
             assertToken(JsonToken.START_OBJECT, p.nextToken());
 
             assertToken(JsonToken.FIELD_NAME, p.nextToken());
-            assertEquals("", p.currentName());
+            assertEquals(XmlTextPropertyNameHolder.PROPERTY_NAME, p.currentName());
             assertToken(JsonToken.VALUE_STRING, p.nextToken());
             assertEquals("value", p.getText());
 
@@ -344,7 +345,7 @@ public void testXmlAttributes() throws Exception
     @Test
     public void testMixedContent() throws Exception
     {
-        String exp = a2q("{'':'first','a':'123','':'second','b':'456','':'last'}");
+        String exp = a2q("{'%1$s':'first','a':'123','%1$s':'second','b':'456','%1$s':'last'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME));
         String result = _readXmlWriteJson("<root>first<a>123</a>second<b>456</b>last</root>");
 
 //System.err.println("result = \n"+result);
@@ -375,7 +376,7 @@ public void testInferredNumbers() throws Exception
         assertEquals(42, xp.getIntValue());
 
         assertToken(JsonToken.FIELD_NAME, xp.nextToken()); // implicit for text
-        assertEquals("", xp.currentName());
+        assertEquals(XmlTextPropertyNameHolder.PROPERTY_NAME, xp.currentName());
 
         assertToken(JsonToken.VALUE_STRING, xp.nextToken());
         assertTrue(xp.isExpectedNumberIntToken());
diff --git a/src/test/java/com/fasterxml/jackson/dataformat/xml/tofix/XmlTextViaCreator306Test.java b/src/test/java/com/fasterxml/jackson/dataformat/xml/tofix/XmlTextViaCreator306Test.java
@@ -115,7 +115,6 @@ public void testIssue306NoCtor() throws Exception
     }
 
     // [dataformat-xml#423]
-    @JacksonTestFailureExpected
     @Test
     public void testXmlTextViaCtor423() throws Exception
     {

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public String extractScalarFromObject(JsonParser p, JsonDeserializer<?> deser,`
`126`	`126`	`final String propName = p.currentName();`
`127`	`127`	`JsonToken t = p.nextToken();`
`128`	`128`	`if (t == JsonToken.VALUE_STRING) {`
`129`		`- if (propName.equals("")) {`
	`129`	`+ if (propName.equals(XmlTextPropertyNameHolder.PROPERTY_NAME)) {`
`130`	`130`	`text = p.getText();`
`131`	`131`	`}`
`132`	`132`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public void testMapWithAttr() throws Exception`
`41`	`41`	`assertEquals(1, map.size());`
`42`	`42`	`Map<String,Object> inner = new LinkedHashMap<>();`
`43`	`43`	`inner.put("lang", "en");`
`44`		`- inner.put("", "John Smith");`
	`44`	`+ inner.put(XmlTextPropertyNameHolder.PROPERTY_NAME, "John Smith");`
`45`	`45`	`assertEquals(Collections.singletonMap("person", inner), map);`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.fasterxml.jackson.dataformat.xml.node;`
`2`	`2`
	`3`	`+import com.fasterxml.jackson.dataformat.xml.deser.XmlTextPropertyNameHolder;`
`3`	`4`	`import org.junit.jupiter.api.Test;`
`4`	`5`
`5`	`6`	`import com.fasterxml.jackson.databind.JsonNode;`
`@@ -19,23 +20,23 @@ public class JsonNodeMixedContent403Test extends XmlTestUtil`
`19`	`20`	`public void testMixedContentBefore() throws Exception`
`20`	`21`	`{`
`21`	`22`	`// First, before elements:`
`22`		`- assertEquals(JSON_MAPPER.readTree(a2q("{'':'before','a':'1','b':'2'}")),`
	`23`	`+ assertEquals(JSON_MAPPER.readTree(a2q("{'%s':'before','a':'1','b':'2'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),`
`23`	`24`	`XML_MAPPER.readTree("<root>before<a>1</a><b>2</b></root>"));`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`@Test`
`27`	`28`	`public void testMixedContentBetween() throws Exception`
`28`	`29`	`{`
`29`	`30`	`// Second, between`
`30`		`- assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','':'between','b':'2'}")),`
	`31`	`+ assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','%s':'between','b':'2'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),`
`31`	`32`	`XML_MAPPER.readTree("<root><a>1</a>between<b>2</b></root>"));`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`@Test`
`35`	`36`	`public void testMixedContentAfter() throws Exception`
`36`	`37`	`{`
`37`	`38`	`// and then after`
`38`		`- assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','b':'2','':'after'}")),`
	`39`	`+ assertEquals(JSON_MAPPER.readTree(a2q("{'a':'1','b':'2','%s':'after'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),`
`39`	`40`	`XML_MAPPER.readTree("<root><a>1</a><b>2</b>after</root>"));`
`40`	`41`	`}`
`41`	`42`
`@@ -44,7 +45,7 @@ public void testMultipleMixedContent() throws Exception`
`44`	`45`	`{`
`45`	`46`	`// and then after`
`46`	`47`	`assertEquals(JSON_MAPPER.readTree(`
`47`		`- a2q("{'':['first','second','third'],'a':'1','b':'2'}")),`
	`48`	`+ a2q("{'%s':['first','second','third'],'a':'1','b':'2'}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME))),`
`48`	`49`	`XML_MAPPER.readTree("<root>first<a>1</a>second<b>2</b>third</root>"));`
`49`	`50`	`}`
`50`	`51`
`@@ -57,7 +58,7 @@ public void testMixed226() throws Exception`
`57`	`58`	`+" mixed2</a>\n"`
`58`	`59`	`+"</root>";`
`59`	`60`	`JsonNode fromJson = JSON_MAPPER.readTree(`
`60`		`- a2q("{'a':{'':['mixed1 ',' mixed2'],'b':'leaf'}}"));`
	`61`	`+ a2q("{'a':{'%s':['mixed1 ',' mixed2'],'b':'leaf'}}".formatted(XmlTextPropertyNameHolder.PROPERTY_NAME)));`
`61`	`62`	`assertEquals(fromJson, XML_MAPPER.readTree(XML));`
`62`	`63`	`}`
`63`	`64`	`}`