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

3 files changed, 1 insertions, 53 deletions

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,