Fixed compilation problems following refactoring for 2.4.0.

pgelinas · Jan 27, 2014 · 2b7960c · 2b7960c
1 parent 136e5d3
commit 2b7960c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 140 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/JacksonXmlAnnotationIntrospector.java b/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

diff --git a/src/main/java/com/fasterxml/jackson/dataformat/xml/XmlFactory.java b/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);
-    }
 
     /*
     /**********************************************************************