Pruning of "deprecated enough" methods from internal (non-public) interfaces

8 files changed, 1 insertions, 118 deletions

diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java b/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
index 99ed3dd0d..f062f4f58 100644
--- a/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
+++ b/src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java
@@ -37,9 +37,6 @@ import com.fasterxml.jackson.databind.util.RootNameLookup;
 public abstract class SerializerProvider
     extends DatabindContext
 {
-    @Deprecated // since 2.3, not used by anything it seems
-    protected final static JavaType TYPE_OBJECT = TypeFactory.defaultInstance().uncheckedSimpleType(Object.class);
-
     /**
      * Setting for determining whether mappings for "unknown classes" should be
      * cached for faster resolution. Usually this isn't needed, but maybe it
@@ -776,19 +773,6 @@ public abstract class SerializerProvider
      */
 
     /**
-     * @deprecated Since 2.3 (and to be removed from 2.4); use
-     *   {@link #handlePrimaryContextualization} or {@link #handleSecondaryContextualization}
-     *   instead
-     */
-    @Deprecated
-    public JsonSerializer<?> handleContextualization(JsonSerializer<?> ser,
-            BeanProperty property)
-        throws JsonMappingException
-    {
-        return handleSecondaryContextualization(ser, property);
-    }
-    
-    /**
      * Method called for primary property serializers (ones
      * directly created to serialize values of a POJO property),
      * to handle details of resolving
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java
index 24c0ca0fc..42583b77e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java
@@ -180,14 +180,6 @@ public class BeanDeserializerBuilder
         //   For now, won't add, since it is inferred, not explicit...
     }
 
-    @Deprecated // since 2.3
-    public void addInjectable(String propName, JavaType propType,
-            Annotations contextAnnotations, AnnotatedMember member,
-            Object valueId)
-    {
-        addInjectable(new PropertyName(propName), propType, contextAnnotations, member, valueId);
-    }
-    
     public void addInjectable(PropertyName propName, JavaType propType,
             Annotations contextAnnotations, AnnotatedMember member,
             Object valueId)
@@ -269,41 +261,17 @@ public class BeanDeserializerBuilder
         return _properties.values().iterator();
     }
 
-    /**
-     * @since 2.3
-     */
     public SettableBeanProperty findProperty(PropertyName propertyName) {
         return _properties.get(propertyName.getSimpleName());
     }
 
-    @Deprecated // since 2.3
-    public SettableBeanProperty findProperty(String propertyName) {
-        return _properties.get(propertyName);
-    }
-
-    /**
-     * @since 2.3
-     */
     public boolean hasProperty(PropertyName propertyName) {
         return findProperty(propertyName) != null;
     }
-    
-    @Deprecated // since 2.3
-    public boolean hasProperty(String propertyName) {
-        return findProperty(propertyName) != null;
-    }
 
-    /**
-     * @since 2.3
-     */
     public SettableBeanProperty removeProperty(PropertyName name) {
         return _properties.remove(name.getSimpleName());
     }
-    
-    @Deprecated // since 2.3
-    public SettableBeanProperty removeProperty(String name) {
-        return _properties.remove(name);
-    }
 
     public SettableAnyProperty getAnySetter() {
         return _anySetter;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java b/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
index bfe5efed1..719f249d9 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java
@@ -48,24 +48,12 @@ public class SettableAnyProperty
     /**********************************************************
      */
 
-    @Deprecated // since 2.3
-    public SettableAnyProperty(BeanProperty property, AnnotatedMethod setter, JavaType type,
-            JsonDeserializer<Object> valueDeser) {
-        this(property, setter, type, valueDeser, null);
-    }
-
     public SettableAnyProperty(BeanProperty property, AnnotatedMethod setter, JavaType type,
             JsonDeserializer<Object> valueDeser, TypeDeserializer typeDeser)
     {
         this(property, setter.getAnnotated(), type, valueDeser, typeDeser);
     }
-    
-    @Deprecated // since 2.3
-    public SettableAnyProperty(BeanProperty property, Method rawSetter, JavaType type,
-            JsonDeserializer<Object> valueDeser) {
-        this(property, rawSetter, type, valueDeser, null);
-    }
-    
+
     public SettableAnyProperty(BeanProperty property, Method rawSetter, JavaType type,
             JsonDeserializer<Object> valueDeser, TypeDeserializer typeDeser)
     {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java b/src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java
index 7b4ee6012..c245c1148 100644
--- a/src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java
+++ b/src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java
@@ -145,14 +145,6 @@ public abstract class SettableBeanProperty
                 contextAnnotations, propDef.getMetadata());
     }
 
-    @Deprecated // since 2.2
-    protected SettableBeanProperty(String propName, JavaType type, PropertyName wrapper,
-            TypeDeserializer typeDeser, Annotations contextAnnotations)
-    {
-        this(new PropertyName(propName), type, wrapper, typeDeser, contextAnnotations,
-                PropertyMetadata.STD_OPTIONAL);
-    }
-
     @Deprecated // since 2.3
     protected SettableBeanProperty(String propName, JavaType type, PropertyName wrapper,
             TypeDeserializer typeDeser, Annotations contextAnnotations,
diff --git a/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java b/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java
index 58767cac5..66150240e 100644
--- a/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java
+++ b/src/main/java/com/fasterxml/jackson/databind/introspect/POJOPropertyBuilder.java
@@ -53,13 +53,6 @@ public class POJOPropertyBuilder
         _annotationIntrospector = annotationIntrospector;
         _forSerialization = forSerialization;
     }
-    
-    @Deprecated // since 2.3
-    public POJOPropertyBuilder(String simpleInternalName,
-            AnnotationIntrospector annotationIntrospector, boolean forSerialization)
-    {
-        this(new PropertyName(simpleInternalName), annotationIntrospector, forSerialization);
-    }
 
     public POJOPropertyBuilder(POJOPropertyBuilder src, PropertyName newName)
     {
@@ -79,12 +72,6 @@ public class POJOPropertyBuilder
     /**********************************************************
      */
 
-    @Deprecated // since 2.3
-    @Override
-    public POJOPropertyBuilder withName(String newName) {
-        return withSimpleName(newName);
-    }
-
     @Override
     public POJOPropertyBuilder withName(PropertyName newName) {
         return new POJOPropertyBuilder(this, newName);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java b/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
index cf0f59322..63b14656a 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java
@@ -434,20 +434,6 @@ public class BeanPropertyWriter extends PropertyWriter
 
     public Class<?>[] getViews() { return _includeInViews; }
 
-    /**
-     *<p>
-     * NOTE: due to introspection, this is a <b>slow</b> method to call
-     * and should never be called during actual serialization or filtering
-     * of the property. Rather it is needed for traversal needed for things
-     * like constructing JSON Schema instances.
-     * 
-     * @since 2.1
-     * 
-     * @deprecated since 2.2, use {@link #isRequired()} instead.
-     */
-    @Deprecated
-    protected boolean isRequired(AnnotationIntrospector intr) { return _metadata.isRequired(); }
-    
     /*
     /**********************************************************
     /* PropertyWriter methods (serialization)
@@ -691,15 +677,6 @@ public class BeanPropertyWriter extends PropertyWriter
     }
 
     /**
-     * @deprecated Since 2.3 Use overloaded variants
-     */
-    @Deprecated
-    protected void _handleSelfReference(Object bean, JsonSerializer<?> ser)
-        throws JsonMappingException {
-        _handleSelfReference(bean, null, null, ser);
-    }
-    
-    /**
      * Method called to handle a direct self-reference through this property.
      * Method can choose to indicate an error by throwing {@link JsonMappingException};
      * fully handle serialization (and return true); or indicate that it should be
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java b/src/main/java/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java
index ac1245341..d590ed850 100644
--- a/src/main/java/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java
+++ b/src/main/java/com/fasterxml/jackson/databind/ser/DefaultSerializerProvider.java
@@ -316,11 +316,6 @@ public abstract class DefaultSerializerProvider
         findValueSerializer(javaType, null).acceptJsonFormatVisitor(visitor, javaType);
     }
 
-    @Deprecated // since 2.3; use the overloaded variant
-    public boolean hasSerializerFor(Class<?> cls) {
-        return hasSerializerFor(cls, null);
-    }
-    
     /**
      * Method that can be called to see if this serializer provider
      * can find a serializer for an instance of given class.
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
index caea32836..895d52902 100644
--- a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
+++ b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
@@ -1114,14 +1114,6 @@ sb.append("NativeObjectIds=").append(_hasNativeObjectIds).append(",");
         /**********************************************************
          */
 
-        @Deprecated // since 2.3
-        protected Parser(Segment firstSeg, ObjectCodec codec) {
-            this(firstSeg, codec, false, false);
-        }
-
-        /**
-         * @since 2.3
-         */
         public Parser(Segment firstSeg, ObjectCodec codec,
                 boolean hasNativeTypeIds,
                 boolean hasNativeObjectIds)