address feedback

Author: duoduobingbing

src/main/java/tools/jackson/dataformat/xml/JacksonXmlAnnotationIntrospector.java

@@ -8,7 +8,6 @@
 import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.introspect.*;
 import tools.jackson.dataformat.xml.annotation.*;
-import tools.jackson.dataformat.xml.deser.FromXmlParser;
 
 /**
  * Extension of {@link JacksonAnnotationIntrospector} that is needed to support
@@ -38,12 +37,19 @@ public class JacksonXmlAnnotationIntrospector
 
     protected boolean _cfgDefaultUseWrapper;
 
+    protected final JacksonXmlAnnotationIntrospectorConfig _cfgIntrospectorConfig;
+
     public JacksonXmlAnnotationIntrospector() {
         this(DEFAULT_USE_WRAPPER);
     }
 
     public JacksonXmlAnnotationIntrospector(boolean defaultUseWrapper) {
+        this(defaultUseWrapper, new JacksonXmlAnnotationIntrospectorConfig());
+    }
+
+    public JacksonXmlAnnotationIntrospector(boolean defaultUseWrapper, JacksonXmlAnnotationIntrospectorConfig introspectorConfig) {
         _cfgDefaultUseWrapper = defaultUseWrapper;
+        _cfgIntrospectorConfig = introspectorConfig;
     }
 
     /*
@@ -85,7 +91,7 @@ public PropertyName findWrapperName(MapperConfig<?> config, Annotated ann)
         }
         return null;
     }
-    
+
     @SuppressWarnings("deprecation")
     @Override
     public PropertyName findRootName(MapperConfig<?> config, AnnotatedClass ac)
@@ -94,7 +100,7 @@ public PropertyName findRootName(MapperConfig<?> config, AnnotatedClass ac)
         if (root != null) {
             String local = root.localName();
             String ns = root.namespace();
-            
+
             if (local.length() == 0 && ns.length() == 0) {
                 return PropertyName.USE_DEFAULT;
             }
@@ -209,8 +215,11 @@ public PropertyName findNameForDeserialization(MapperConfig<?> config, Annotated
         PropertyName pn = PropertyName.merge(_findXmlName(a),
                 super.findNameForDeserialization(config, a));
         if (pn == null) {
-            if(_hasAnnotation(a, JacksonXmlText.class)){
-                return PropertyName.construct(FromXmlParser.DEFAULT_TEXT_PROPERTY);
+            JacksonXmlText jacksonXmlTextAnnotation = _findAnnotation(a, JacksonXmlText.class);
+
+            if (jacksonXmlTextAnnotation != null && jacksonXmlTextAnnotation.value() &&
+                !_cfgIntrospectorConfig.inferXmlTextPropertyName()) {
+                return _cfgIntrospectorConfig.xmlTextPropertyName();
             }
 
             if (_hasOneOf(a, ANNOTATIONS_TO_INFER_XML_PROP)) {

src/main/java/tools/jackson/dataformat/xml/JacksonXmlAnnotationIntrospectorConfig.java

@@ -0,0 +1,28 @@
+package tools.jackson.dataformat.xml;
+
+import tools.jackson.databind.PropertyName;
+import tools.jackson.dataformat.xml.deser.FromXmlParser;
+
+import java.io.Serializable;
+
+public record JacksonXmlAnnotationIntrospectorConfig(
+        boolean inferXmlTextPropertyName,
+        PropertyName xmlTextPropertyName //Only honored if inferXmlTextPropertyName is false
+) implements Serializable {
+
+    /**
+     * Constructs a JacksonXmlAnnotationIntrospectorConfig with the default configuration
+     * Does not infer the XmlTextPropertyName by default and uses {@link FromXmlParser#DEFAULT_TEXT_PROPERTY} for the {@link PropertyName}.
+     */
+    public JacksonXmlAnnotationIntrospectorConfig() {
+        this(false, PropertyName.construct(FromXmlParser.DEFAULT_TEXT_PROPERTY));
+    }
+
+    public JacksonXmlAnnotationIntrospectorConfig withInferXmlTextPropertyName(boolean inferXmlTextPropertyName) {
+        return new JacksonXmlAnnotationIntrospectorConfig(inferXmlTextPropertyName, this.xmlTextPropertyName);
+    }
+
+    public JacksonXmlAnnotationIntrospectorConfig withXmlTextPropertyName(PropertyName xmlTextPropertyName) {
+        return new JacksonXmlAnnotationIntrospectorConfig(this.inferXmlTextPropertyName, xmlTextPropertyName);
+    }
+}

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

@@ -36,7 +36,7 @@ public class FromXmlParser
 {
     /**
      * The default name placeholder for XML text segments is <xml:text>
-     * @since 3.0.0 Is now <xml:text> - was empty String ("") before.
+     * @since 3.0 Is now <xml:text> - was empty String ("") before.
      */
     public final static String DEFAULT_TEXT_PROPERTY = "<xml:text>";
 

src/test/java/tools/jackson/dataformat/xml/deser/DifferentDeserializationPropertyNameTest.java

@@ -0,0 +1,75 @@
+package tools.jackson.dataformat.xml.deser;
+
+import org.junit.jupiter.api.Test;
+import tools.jackson.databind.DatabindException;
+import tools.jackson.databind.PropertyName;
+import tools.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector;
+import tools.jackson.dataformat.xml.JacksonXmlAnnotationIntrospectorConfig;
+import tools.jackson.dataformat.xml.XmlMapper;
+import tools.jackson.dataformat.xml.XmlTestUtil;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import tools.jackson.dataformat.xml.annotation.JacksonXmlText;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DifferentDeserializationPropertyNameTest extends XmlTestUtil {
+
+    static class TestBean {
+
+        @JacksonXmlProperty(localName = "wrong")
+        String wrong;
+
+        @JacksonXmlText
+        String name;
+
+
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    @Test
+    public void testWithExplicitProperty() {
+        final XmlMapper mapper = XmlMapper.builder()
+                .annotationIntrospector(new JacksonXmlAnnotationIntrospector(false, new JacksonXmlAnnotationIntrospectorConfig(false, new PropertyName("name"))))
+                .build();
+
+        String xmlInput = "<testBean>ABC123</testBean>";
+
+        TestBean testBean = mapper.readValue(xmlInput, TestBean.class);
+
+        assertEquals("ABC123", testBean.name);
+    }
+
+    @Test
+    public void testWithInferName() {
+        final XmlMapper mapper = XmlMapper.builder()
+                .annotationIntrospector(new JacksonXmlAnnotationIntrospector(false, new JacksonXmlAnnotationIntrospectorConfig(true, null)))
+                .build();
+
+        String xmlInput = "<testBean>DEF</testBean>";
+
+        TestBean testBean = mapper.readValue(xmlInput, TestBean.class);
+
+        assertEquals("DEF", testBean.name);
+    }
+
+    @Test
+    public void testWithDuplicateExplicitProperty() {
+        final XmlMapper mapper = XmlMapper.builder()
+                .annotationIntrospector(new JacksonXmlAnnotationIntrospector(false, new JacksonXmlAnnotationIntrospectorConfig(false, new PropertyName("wrong"))))
+                .build();
+
+        String xmlInput = "<testBean>DEF</testBean>";
+
+        Exception result = assertThrows(DatabindException.class, () -> mapper.readValue(xmlInput, TestBean.class));
+
+        assertTrue(result.getMessage().contains("Multiple fields representing property \"wrong\""));
+    }
+
+}