Start working on #4907

Author: cowtowncoder

src/main/java/tools/jackson/databind/BeanDescription.java

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import tools.jackson.databind.annotation.JsonPOJOBuilder;
 import tools.jackson.databind.introspect.*;
 import tools.jackson.databind.util.Annotations;
 import tools.jackson.databind.util.Converter;
@@ -255,12 +254,6 @@ public AnnotatedMember findJsonKeyAccessor() {
      */
     public abstract Converter<Object,Object> findDeserializationConverter();
 
-    /**
-     * Accessor for possible description for the bean type, used for constructing
-     * documentation.
-     */
-    public String findClassDescription() { return null; }
-
     /*
     /**********************************************************************
     /* Basic API, other
@@ -269,19 +262,6 @@ public AnnotatedMember findJsonKeyAccessor() {
 
     public abstract Map<Object, AnnotatedMember> findInjectables();
 
-    /**
-     * Method for checking if the POJO type has annotations to
-     * indicate that a builder is to be used for instantiating
-     * instances and handling data binding, instead of standard
-     * bean deserializer.
-     */
-    public abstract Class<?> findPOJOBuilder();
-
-    /**
-     * Method for finding configuration for POJO Builder class.
-     */
-    public abstract JsonPOJOBuilder.Value findPOJOBuilderConfig();
-
     /**
      * Method called to create a "default instance" of the bean, currently
      * only needed for obtaining default field values which may be used for

src/main/java/tools/jackson/databind/deser/BeanDeserializerFactory.java

@@ -337,7 +337,8 @@ protected ValueDeserializer<Object> buildBuilderBasedDeserializer(
         addBackReferenceProperties(ctxt, builderDescRef, builder);
         addInjectables(ctxt, builderDescRef, builder);
 
-        JsonPOJOBuilder.Value builderConfig = builderDescRef.get().findPOJOBuilderConfig();
+        JsonPOJOBuilder.Value builderConfig = ctxt.getAnnotationIntrospector()
+                .findPOJOBuilderConfig(config, builderDescRef.getClassInfo());
         final String buildMethodName = (builderConfig == null) ?
                 JsonPOJOBuilder.DEFAULT_BUILD_METHOD : builderConfig.buildMethodName;
 

src/main/java/tools/jackson/databind/deser/DeserializerCache.java

@@ -338,7 +338,8 @@ protected ValueDeserializer<Object> _createDeserializer(DeserializationContext c
         }
 
         // We may also have a Builder type to consider...
-        Class<?> builder = beanDescRef.get().findPOJOBuilder();
+        Class<?> builder = ctxt.getAnnotationIntrospector().findPOJOBuilder(config,
+                beanDescRef.getClassInfo());
         if (builder != null) {
             return (ValueDeserializer<Object>) factory.createBuilderBasedDeserializer(
             		ctxt, type, beanDescRef, builder);

src/main/java/tools/jackson/databind/introspect/BasicBeanDescription.java

@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import tools.jackson.databind.*;
-import tools.jackson.databind.annotation.JsonPOJOBuilder;
 import tools.jackson.databind.cfg.HandlerInstantiator;
 import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.util.Annotations;
@@ -654,29 +653,13 @@ protected AnnotatedAndMetadata<AnnotatedMethod, JsonCreator.Mode> findFactoryMet
     /**********************************************************************
      */
 
-    @Override
-    public Class<?> findPOJOBuilder() {
-        return _intr.findPOJOBuilder(_config, _classInfo);
-    }
-
-    @Override
-    public JsonPOJOBuilder.Value findPOJOBuilderConfig()
-    {
-        return _intr.findPOJOBuilderConfig(_config, _classInfo);
-    }
-
     @Override
     public Converter<Object,Object> findDeserializationConverter()
     {
         return _createConverter(_intr
                         .findDeserializationConverter(_config, _classInfo));
     }
 
-    @Override
-    public String findClassDescription() {
-        return _intr.findClassDescription(_config, _classInfo);
-    }
-
     /*
     /**********************************************************************
     /* Helper methods, other

src/test/java/tools/jackson/databind/introspect/BeanDescriptionTest.java

@@ -24,6 +24,7 @@ static class DocumentedBean {
     public void testClassDesc() throws Exception
     {
         BeanDescription beanDesc = ObjectMapperTestAccess.beanDescriptionForDeser(MAPPER, DocumentedBean.class);
-        assertEquals(CLASS_DESC, beanDesc.findClassDescription());
+        assertEquals(CLASS_DESC, MAPPER.deserializationConfig().getAnnotationIntrospector()
+                .findClassDescription(MAPPER.deserializationConfig(), beanDesc.getClassInfo()));
     }
 }