Bit of refactoring for BeanDescription.Supplier (post #5093, #5094)

Author: cowtowncoder

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

@@ -36,6 +36,10 @@ protected BeanDescription(JavaType type) {
         _type = type;
     }
 
+    public BeanDescription.Supplier supplier() {
+        return new EagerSupplier(this);
+    }
+
     /*
     /**********************************************************************
     /* Simple accessors
@@ -303,30 +307,45 @@ public AnnotatedMember findJsonKeyAccessor() {
     /**
      * Base implementation for lazily-constructed suppliers for {@link BeanDescription} instances.
      */
-    public static abstract class Supplier implements java.util.function.Supplier<BeanDescription>
+    public interface Supplier extends java.util.function.Supplier<BeanDescription>
+    {
+        JavaType getType();
+
+        default Class<?> getBeanClass() { return getType().getRawClass(); }
+
+        default boolean isRecordType() { return getType().isRecordType(); }
+
+        default AnnotatedClass getClassInfo() {
+            return get().getClassInfo();
+        }
+
+        default Annotations getClassAnnotations() {
+            return get().getClassAnnotations();
+        }
+
+        @Override
+        public BeanDescription get();
+    }
+
+    public static abstract class LazySupplier implements Supplier
     {
-        private final JavaType _type;
+        protected final JavaType _type;
 
-        private transient BeanDescription _beanDesc;
+        protected transient BeanDescription _beanDesc;
 
-        protected Supplier(JavaType type) {
+        protected LazySupplier(JavaType type) {
             _type = type;
         }
 
+        @Override
         public JavaType getType() { return _type; }
 
+        @Override
         public Class<?> getBeanClass() { return _type.getRawClass(); }
 
+        @Override
         public boolean isRecordType() { return _type.isRecordType(); }
 
-        public AnnotatedClass getClassInfo() {
-            return get().getClassInfo();
-        }
-
-        public Annotations getClassAnnotations() {
-            return get().getClassAnnotations();
-        }
-
         @Override
         public BeanDescription get() {
             if (_beanDesc == null) {
@@ -337,4 +356,19 @@ public BeanDescription get() {
 
         protected abstract BeanDescription _construct(JavaType forType);
     }
+
+    public static class EagerSupplier implements Supplier
+    {
+        protected final BeanDescription _beanDesc;
+
+        public EagerSupplier(BeanDescription beanDesc) {
+            _beanDesc = Objects.requireNonNull(beanDesc);
+        }
+
+        @Override
+        public JavaType getType() { return _beanDesc.getType(); }
+
+        @Override
+        public BeanDescription get() { return _beanDesc; }
+    }  
 }

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

@@ -313,7 +313,7 @@ protected abstract DatabindException invalidTypeIdException(JavaType baseType, S
     public abstract BeanDescription introspectBeanDescription(JavaType type);
 
     public BeanDescription.Supplier lazyIntrospectBeanDescription(JavaType type) {
-         return new BeanDescription.Supplier(type) {
+         return new BeanDescription.LazySupplier(type) {
              @Override
              public BeanDescription _construct(JavaType forType) {
                  return introspectBeanDescription(forType);

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

@@ -537,7 +537,7 @@ public BeanDescription introspectBeanDescriptionForCreation(JavaType type) {
     }
 
     public BeanDescription.Supplier lazyIntrospectBeanDescriptionForCreation(JavaType type) {
-        return new BeanDescription.Supplier(type) {
+        return new BeanDescription.LazySupplier(type) {
             @Override
             public BeanDescription _construct(JavaType forType) {
                 return introspectBeanDescriptionForCreation(forType);
@@ -553,7 +553,7 @@ public BeanDescription introspectBeanDescriptionForBuilder(JavaType builderType,
 
     public BeanDescription.Supplier lazyIntrospectBeanDescriptionForBuilder(final JavaType builderType,
             final BeanDescription valueTypeDesc) {
-        return new BeanDescription.Supplier(builderType) {
+        return new BeanDescription.LazySupplier(builderType) {
             @Override
             public BeanDescription _construct(JavaType forType) {
                 return introspectBeanDescriptionForBuilder(forType, valueTypeDesc);