Merge branch 'master' of github.com:pgelinas/jackson-dataformat-xml into pgelinas-master

Conflicts:
	pom.xml

Author: cowtowncoder

pom.xml

@@ -10,7 +10,7 @@
 
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-xml</artifactId>
-  <version>2.3.2-SNAPSHOT</version>
+  <version>2.4.0-SNAPSHOT</version>
   <name>Jackson-dataformat-XML</name>
   <packaging>bundle</packaging>
   <description>Data format extension for Jackson (http://jackson.codehaus.org) to offer
@@ -28,10 +28,9 @@ Some data-binding types overridden as well (ObjectMapper sub-classed as XmlMappe
   </scm>
 
   <properties>
-    <!-- no patch versions for annotations (since 2.3) -->
-    <jackson.version.annotations>2.3.0</jackson.version.annotations>
-    <jackson.version.core>2.3.2-SNAPSHOT</jackson.version.core>
-    <jackson.version.jaxb>2.3.1</jackson.version.jaxb>
+    <jackson.version.annotations>2.4-SNAPSHOT</jackson.version.annotations>
+    <jackson.version.core>2.4.0-SNAPSHOT</jackson.version.core>
+    <jackson.version.jaxb>${jackson.version.core}</jackson.version.jaxb>
     <packageVersion.dir>com/fasterxml/jackson/dataformat/xml</packageVersion.dir>
     <packageVersion.package>${project.groupId}.xml</packageVersion.package>
 

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

@@ -145,47 +145,6 @@ public PropertyName findNameForSerialization(Annotated a)
         return name;
     }
 
-    /* Ok, now: following contains quite a bit of duplication.
-     * But it is still needed since trying to refactor things tends
-     * to end in infinite loop or stack overflow... we can eventually
-     * remove these methods once we are certain that core databinding
-     * never calls these methods (perhaps with 2.3 or at latest 2.4)
-     */
-    
-    @Deprecated
-    @Override
-    public String findSerializationName(AnnotatedField a)
-    {
-        PropertyName pname = _findXmlName(a);
-        if (pname != null) {
-            return pname.getSimpleName();
-        }
-        String name = super.findSerializationName(a);
-        if (name == null) {
-            if (a.hasAnnotation(JacksonXmlText.class)) {
-                return "";
-            }
-        }
-        return name;
-    }
-
-    @Deprecated
-    @Override
-    public String findSerializationName(AnnotatedMethod a)
-    {
-        PropertyName pname = _findXmlName(a);
-        if (pname != null) {
-            return pname.getSimpleName();
-        }
-        String name = super.findSerializationName(a);
-        if (name == null) {
-            if (a.hasAnnotation(JacksonXmlText.class)) {
-                return "";
-            }
-        }
-        return name;
-    }
-
     @Override
     public PropertyName findNameForDeserialization(Annotated a)
     {
@@ -201,62 +160,6 @@ public PropertyName findNameForDeserialization(Annotated a)
         return name;
     }
 
-    @Deprecated
-    @Override
-    public String findDeserializationName(AnnotatedField a)
-    {
-        PropertyName pname = _findXmlName(a);
-        if (pname != null) {
-            return pname.getSimpleName();
-        }
-        String name = super.findDeserializationName(a);
-        if (name == null) {
-            if (a.hasAnnotation(JacksonXmlText.class)) {
-                return "";
-            }
-        }
-        return name;
-    }
-
-    @Deprecated
-    @Override
-    public String findDeserializationName(AnnotatedMethod a)
-    {
-        PropertyName pname = _findXmlName(a);
-        if (pname != null) {
-            return pname.getSimpleName();
-        }
-        String name = super.findDeserializationName(a);
-        if (name == null) {
-            if (a.hasAnnotation(JacksonXmlText.class)) {
-                return "";
-            }
-        }
-        return name;
-    }
-    
-    @Deprecated
-    @Override
-    public String findDeserializationName(AnnotatedParameter a)
-    {
-        PropertyName pname = _findXmlName(a);
-        if (pname != null) {
-            // empty name not acceptable...
-            String local = pname.getSimpleName();
-            if (local != null && local.length() > 0) {
-                return local;
-            }
-        }
-        // xml text still has special handling...
-        String name = super.findDeserializationName(a);
-        if (name == null) {
-            if (a.hasAnnotation(JacksonXmlText.class)) {
-                return "";
-            }
-        }
-        return super.findDeserializationName(a);
-    }
-    
     /*
     /**********************************************************************
     /* Overrides for non-public helper methods

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

@@ -499,49 +499,6 @@ protected FromXmlParser _createParser(byte[] data, int offset, int len, IOContex
         return xp;
     }
 
-    /*
-    /**********************************************************
-    /* Deprecated internal factory methods for parser creation
-    /**********************************************************
-     */
-
-    //protected IOContext _createContext(Object srcRef, boolean resourceManaged)
-
-    /**
-     * Overridable factory method that actually instantiates desired
-     * parser.
-     */
-    @Override
-    @Deprecated
-    protected FromXmlParser _createJsonParser(InputStream in, IOContext ctxt)
-        throws IOException, JsonParseException
-    {
-        return _createParser(in, ctxt);
-    }
-
-    /**
-     * Overridable factory method that actually instantiates desired
-     * parser.
-     */
-    @Override
-    @Deprecated
-    protected FromXmlParser _createJsonParser(Reader r, IOContext ctxt)
-        throws IOException, JsonParseException
-    {
-        return _createParser(r, ctxt);
-    }
-
-    /**
-     * Overridable factory method that actually instantiates desired
-     * parser.
-     */
-    @Override
-    @Deprecated
-    protected FromXmlParser _createJsonParser(byte[] data, int offset, int len, IOContext ctxt)
-        throws IOException, JsonParseException
-    {
-        return _createParser(data, offset, len, ctxt);
-    }
 
     /*
     /**********************************************************************

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

@@ -12,6 +12,7 @@
 import com.fasterxml.jackson.core.base.ParserMinimalBase;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.util.ByteArrayBuilder;
+import com.fasterxml.jackson.dataformat.xml.PackageVersion;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 
 /**
@@ -807,4 +808,10 @@ protected boolean _isEmpty(String str)
         }
         return true;
     }
+
+    @Override
+    public Version version()
+    {
+        return PackageVersion.VERSION;
+    }
 }