Fix #273

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -66,6 +66,11 @@ Alexei Volkov (softkot@github)
 * Reported #294: XML parser error with nested same element names
  (2.11.1)
 
+Joseph Petersen (jetersen@github)
+
+* Reported #273: Input mismatch with case-insensitive properties
+ (2.12.0)
+
 Jochen Schalanda (joschi@github)
 
 * Reported #318: XMLMapper fails to deserialize null (POJO reference) from blank tag

release-notes/VERSION-2.x

@@ -6,6 +6,8 @@ Project: jackson-dataformat-xml
 
 2.12.0 (not yet released)
 
+#273: Input mismatch with case-insensitive properties
+ (reported by Joseph P)
 #318: XMLMapper fails to deserialize null (POJO reference) from blank tag
  (reported by Jochen S)
 

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/FromXmlParser.java

@@ -16,6 +16,7 @@
 import com.fasterxml.jackson.core.util.ByteArrayBuilder;
 import com.fasterxml.jackson.dataformat.xml.PackageVersion;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+import com.fasterxml.jackson.dataformat.xml.util.CaseInsensitiveNameSet;
 import com.fasterxml.jackson.dataformat.xml.util.StaxUtil;
 
 /**
@@ -317,21 +318,31 @@ public XMLStreamReader getStaxReader() {
      * patch versions). So if you have to use it, be prepared for
      * possible additional work.
      * 
-     * @since 2.1
+     * @since 2.12
      */
-    public void addVirtualWrapping(Set<String> namesToWrap)
+    public void addVirtualWrapping(Set<String> namesToWrap0, boolean caseInsensitive)
     {
-//System.out.println("addVirtualWrapping("+namesToWrap+")");
-        // 17-Sep-2012, tatu: Not 100% sure why, but this is necessary to avoid
+System.out.printf("addVirtualWrapping(%s) [case-insensitive? %s]\n", namesToWrap0, caseInsensitive);
+
+        final Set<String> namesToWrap = caseInsensitive
+                ? CaseInsensitiveNameSet.construct(namesToWrap0)
+                : namesToWrap0;
+
+// 17-Sep-2012, tatu: Not 100% sure why, but this is necessary to avoid
         //   problems with Lists-in-Lists properties
         String name = _xmlTokens.getLocalName();
-        if (name != null && namesToWrap.contains(name)) {
-//System.out.println("REPEAT from addVirtualWrapping()");
+        if ((name != null) && namesToWrap.contains(name)) {
+System.out.println("REPEAT from addVirtualWrapping()");
             _xmlTokens.repeatStartElement();
         }
         _parsingContext.setNamesToWrap(namesToWrap);
     }
 
+    @Deprecated // since 2.12
+    public void addVirtualWrapping(Set<String> namesToWrap) {
+        addVirtualWrapping(namesToWrap, false);
+    }
+
     /*
     /**********************************************************
     /* JsonParser impl

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/WrapperHandlingDeserializer.java

@@ -28,6 +28,9 @@ public class WrapperHandlingDeserializer
     protected final Set<String> _namesToWrap;
 
     protected final JavaType _type;
+
+    // @since 2.12
+    protected final boolean _caseInsensitive;
 
     /*
     /**********************************************************************
@@ -44,6 +47,7 @@ public WrapperHandlingDeserializer(BeanDeserializerBase delegate, Set<String> na
         super(delegate);
         _namesToWrap = namesToWrap;
         _type = delegate.getValueType();
+        _caseInsensitive = delegate.isCaseInsensitive();
     }
 
     /*
@@ -147,7 +151,7 @@ protected final void _configureParser(JsonParser p) throws IOException
             p = ((JsonParserDelegate) p).delegate();
         }
         if (p instanceof FromXmlParser) {
-            ((FromXmlParser) p).addVirtualWrapping(_namesToWrap);
+            ((FromXmlParser) p).addVirtualWrapping(_namesToWrap, _caseInsensitive);
         }
     }
 

src/main/java/com/fasterxml/jackson/dataformat/xml/deser/XmlReadContext.java

@@ -176,11 +176,6 @@ public void setNamesToWrap(Set<String> namesToWrap) {
         _namesToWrap = namesToWrap;
     }
 
-    @Deprecated // since 2.11.1
-    public Set<String> getNamesToWrap() {
-        return _namesToWrap;
-    }
-
     // @since 2.11.1
     public boolean shouldWrap(String localName) {
         return (_namesToWrap != null) && _namesToWrap.contains(localName);

src/main/java/com/fasterxml/jackson/dataformat/xml/util/CaseInsensitiveNameSet.java

@@ -0,0 +1,46 @@
+package com.fasterxml.jackson.dataformat.xml.util;
+
+import java.util.*;
+
+/**
+ * Helper class for matching element wrappers, possibly in case-insensitive
+ * manner.
+ *
+ * @since 2.12
+ */
+public final class CaseInsensitiveNameSet extends AbstractSet<String>
+{
+    private final Set<String> _namesToMatch;
+
+    private CaseInsensitiveNameSet(Set<String> namesToMatch) {
+        _namesToMatch = namesToMatch;
+    }
+
+    public static CaseInsensitiveNameSet construct(Set<String> names0) {
+        Set<String> namesToMatch = new HashSet<String>(names0);
+        for (String name : names0) {
+            namesToMatch.add(name.toLowerCase());
+        }
+        return new CaseInsensitiveNameSet(namesToMatch);
+    }
+
+    @Override
+    public boolean contains(Object key0) {
+        final String key = (String) key0;
+        if (_namesToMatch.contains(key)) {
+            return true;
+        }
+        final String lc = key.toLowerCase();
+        return (lc != key) && _namesToMatch.contains(lc);
+    }
+
+    @Override
+    public Iterator<String> iterator() {
+        return _namesToMatch.iterator();
+    }
+
+    @Override
+    public int size() {
+        return _namesToMatch.size();
+    }
+}

src/test/java/com/fasterxml/jackson/dataformat/xml/failing/CaseInsensitiveDeser273Test.java renamed to src/test/java/com/fasterxml/jackson/dataformat/xml/deser/CaseInsensitiveDeser273Test.java

@@ -1,8 +1,11 @@
-package com.fasterxml.jackson.dataformat.xml.failing;
+package com.fasterxml.jackson.dataformat.xml.deser;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import com.fasterxml.jackson.databind.*;
+
 import com.fasterxml.jackson.dataformat.xml.XmlTestBase;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -25,7 +28,7 @@ public void setElement(List<Depot273> l) {
         }
     }
 
-//    @JsonIgnoreProperties(ignoreUnknown = true)
+    @JsonIgnoreProperties(ignoreUnknown = true)
     static class Depot273
     {
         @JacksonXmlProperty(isAttribute = true)
@@ -34,7 +37,7 @@ static class Depot273
         @JacksonXmlProperty(isAttribute = true)
         public String name;
 
-        // Should not actually be necessary but...
+        // Should not actually be necessary but unless unknown ignored is needed:
         @JacksonXmlText
         public String text;