Merge branch '2.11' into 2.12

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -30,6 +30,7 @@ Project: jackson-dataformat-xml
 #399: Can not deserialize unwrapped list when `@JacksonXmlProperty` localName matches
   the parent's localName
  (reported by sandboxgod@github)
+#404: Make `@JacksonXmlElementWrapper` indicate XML property
 
 2.11.0 (26-Apr-2020)
 

src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlAnnotationIntrospector.java

@@ -1,5 +1,7 @@
 package com.fasterxml.jackson.dataformat.xml;
 
+import java.lang.annotation.Annotation;
+
 import com.fasterxml.jackson.databind.PropertyName;
 import com.fasterxml.jackson.databind.introspect.*;
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
@@ -18,6 +20,13 @@ public class JacksonXmlAnnotationIntrospector
 {
     private static final long serialVersionUID = 1L;
 
+    // @since 2.11.1
+    @SuppressWarnings("unchecked")
+    private final static Class<? extends Annotation>[] ANNOTATIONS_TO_INFER_XML_PROP =
+            (Class<? extends Annotation>[]) new Class<?>[] {
+        JacksonXmlText.class, JacksonXmlElementWrapper.class
+    };
+
     /**
      * For backwards compatibility with 2.0, the default behavior is
      * to assume use of List wrapper if no annotations are used.
@@ -151,7 +160,7 @@ public PropertyName findNameForSerialization(Annotated a)
         if (name == null) {
             name = super.findNameForSerialization(a);
             if (name == null) {
-                if (a.hasAnnotation(JacksonXmlText.class)) {
+                if (_hasOneOf(a, ANNOTATIONS_TO_INFER_XML_PROP)) {
                     return PropertyName.USE_DEFAULT;
                 }
             }
@@ -166,7 +175,7 @@ public PropertyName findNameForDeserialization(Annotated a)
         if (name == null) {
             name = super.findNameForDeserialization(a);
             if (name == null) {
-                if (a.hasAnnotation(JacksonXmlText.class)) {
+                if (_hasOneOf(a, ANNOTATIONS_TO_INFER_XML_PROP)) {
                     return PropertyName.USE_DEFAULT;
                 }
             }

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/UntypedListSerialization8Test.java

@@ -35,14 +35,14 @@ public TypedListBean() {
             list = l;
         }
     }
-    
+
     /*
     /**********************************************************
     /* Unit tests
     /**********************************************************
      */
 
-    private final XmlMapper MAPPER = new XmlMapper();
+    private final XmlMapper MAPPER = newMapper();
 
     /*
      *  For [dataformat-xml#8] -- Will not use wrapping, if type is not statically known

src/test/java/com/fasterxml/jackson/dataformat/xml/ser/EmptyPolymorphicTest.java

@@ -32,9 +32,9 @@ static class EmptyProxy implements Proxy { }
     /* Test methods
     /**********************************************************
      */
-    
-    protected XmlMapper MAPPER = new XmlMapper();
-    
+
+    private final XmlMapper MAPPER = newMapper();
+
     public void testEmpty() throws Exception
     {
         String xml = MAPPER.writerWithDefaultPrettyPrinter().writeValueAsString(new Data("Foobar"));