More follow-up work wrt #4907

Author: cowtowncoder

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

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.introspect.*;
 import tools.jackson.databind.util.Annotations;
 
@@ -280,21 +281,21 @@ public interface Supplier extends java.util.function.Supplier<BeanDescription>
         JavaType getType();
 
         boolean isRecordType();
+
+        JsonFormat.Value findExpectedFormat(MapperConfig<?> config, Class<?> baseType);
     }
 
-    /**
-     * Partial implementation for lazily-constructed suppliers for {@link BeanDescription} instances.
-     */
-    public static abstract class LazySupplier implements Supplier
+    protected static abstract class SupplierBase implements Supplier
     {
         protected final JavaType _type;
 
-        protected transient AnnotatedClass _classDesc;
+        /**
+         * Format definitions lazily introspected from class annotations
+         */
+        protected transient JsonFormat.Value _classFormat;
 
-        protected transient BeanDescription _beanDesc;
-        
-        protected LazySupplier(JavaType type) {
-            _type = type;
+        protected SupplierBase(JavaType type) {
+             _type = type;
         }
 
         // // Simple accessors:
@@ -308,6 +309,41 @@ protected LazySupplier(JavaType type) {
         @Override
         public boolean isRecordType() { return _type.isRecordType(); }
 
+        // // // Introspection
+
+        @Override
+        public JsonFormat.Value findExpectedFormat(MapperConfig<?> config, Class<?> baseType)
+        {
+            JsonFormat.Value v0 = _classFormat;
+            if (v0 == null) { // copied from above
+                v0 = config.getAnnotationIntrospector().findFormat(config,
+                        getClassInfo());
+                if (v0 == null) {
+                    v0 = JsonFormat.Value.empty();
+                }
+                _classFormat = v0;
+            }
+            JsonFormat.Value v1 = config.getDefaultPropertyFormat(baseType);
+            if (v1 == null) {
+                return v0;
+            }
+            return JsonFormat.Value.merge(v0, v1);
+        }
+    }
+
+    /**
+     * Partial implementation for lazily-constructed suppliers for {@link BeanDescription} instances.
+     */
+    public static abstract class LazySupplier extends SupplierBase
+    {
+        protected transient AnnotatedClass _classDesc;
+
+        protected transient BeanDescription _beanDesc;
+
+        protected LazySupplier(JavaType type) {
+            super(type);
+        }
+
         // // Entity accessors:
 
         @Override
@@ -334,6 +370,8 @@ public BeanDescription get() {
             return _beanDesc;
         }
 
+        // // // Internal factory methods
+
         protected abstract AnnotatedClass _introspect(JavaType forType);
 
         protected abstract BeanDescription _construct(JavaType forType, AnnotatedClass ac);
@@ -343,23 +381,15 @@ public BeanDescription get() {
      * Simple {@link Supplier} implementation that just returns pre-constructed
      * {@link BeanDescription} instance.
      */
-    public static class EagerSupplier implements Supplier
+    public static class EagerSupplier extends SupplierBase
     {
         protected final BeanDescription _beanDesc;
 
         public EagerSupplier(BeanDescription beanDesc) {
-            _beanDesc = Objects.requireNonNull(beanDesc);
+            super(beanDesc.getType());
+            _beanDesc = beanDesc;
         }
 
-        @Override
-        public Class<?> getBeanClass() { return _beanDesc.getBeanClass(); }
-
-        @Override
-        public boolean isRecordType() { return getType().isRecordType(); }
-
-        @Override
-        public JavaType getType() { return _beanDesc.getType(); }
-
         @Override
         public BeanDescription get() { return _beanDesc; }
 

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

@@ -378,7 +378,7 @@ protected ValueDeserializer<?> _createDeserializer2(DeserializationContext ctxt,
             }
             if (type.isMapLikeType()) {
                 // 11-Mar-2017, tatu: As per [databind#1554], also need to block
-                //    handling as Map if overriden with "as POJO" option.
+                //    handling as Map if overridden with "as POJO" option.
                 // Ideally we'd determine it bit later on (to allow custom handler checks)
                 // but that won't work for other reasons. So do it here.
                 // (read: rewrite for 3.0)